pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

add new patches, fix configuration problem



Module Name:	pkgsrc-wip
Committed By:	K.I.A.Derouiche <kamel.derouiche%gmail.com@localhost>
Pushed By:	jihbed
Date:		Sat Oct 31 18:28:23 2015 +0100
Changeset:	269046a17fea0f10147b17aef7629e0b8d57490f

Modified Files:
	codeblocks/Makefile
	codeblocks/distinfo
	codeblocks/patches/patch-ac
Added Files:
	codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure
	codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure
	codeblocks/patches/patch-src_sdk_wxpropgrid_configure

Log Message:
add new patches, fix configuration problem

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=269046a17fea0f10147b17aef7629e0b8d57490f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 codeblocks/Makefile                                         |  3 ++-
 codeblocks/distinfo                                         |  5 ++++-
 codeblocks/patches/patch-ac                                 |  2 +-
 ...tch-src_plugins_contrib_wxContribItems_wxchart_configure | 13 +++++++++++++
 ...ch-src_plugins_contrib_wxContribItems_wxthings_configure | 13 +++++++++++++
 codeblocks/patches/patch-src_sdk_wxpropgrid_configure       | 13 +++++++++++++
 6 files changed, 46 insertions(+), 3 deletions(-)

diffs:
diff --git a/codeblocks/Makefile b/codeblocks/Makefile
index 2d6b403..c2d5cbb 100644
--- a/codeblocks/Makefile
+++ b/codeblocks/Makefile
@@ -26,7 +26,8 @@ CONFIGURE_ARGS+=	--with-contrib-plugins=AutoVersioning,BrowseTracker,byogames,cb
 
 PKGCONFIG_OVERRIDE+=	codeblocks.pc.in
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/codeblocks/distinfo b/codeblocks/distinfo
index 890a986..cb30847 100644
--- a/codeblocks/distinfo
+++ b/codeblocks/distinfo
@@ -3,4 +3,7 @@ $NetBSD: distinfo,v 1.4 2015/09/15 11:26:40 realzhtw Exp $
 SHA1 (codeblocks_13.12-1.tar.gz) = 3d16f977c9dcc0d857f61af3233a76d6a68609e3
 RMD160 (codeblocks_13.12-1.tar.gz) = e5e469431b792687ba029689b1107a0d735bce8b
 Size (codeblocks_13.12-1.tar.gz) = 17221056 bytes
-SHA1 (patch-ac) = 71f5e31e5a344c2699637f18783f2a2103c6cfd1
+SHA1 (patch-ac) = acfe18d848e959ed62885c5efc8f6f2129acff5a
+SHA1 (patch-src_plugins_contrib_wxContribItems_wxchart_configure) = 4dffe936b6cd21388771db2828f9f322cbec32e7
+SHA1 (patch-src_plugins_contrib_wxContribItems_wxthings_configure) = 0143703b7ebbd98bae83aea189dc016f667779b6
+SHA1 (patch-src_sdk_wxpropgrid_configure) = b796c0a5b0ad1b44c1757b5b7a0f480c9ec5b929
diff --git a/codeblocks/patches/patch-ac b/codeblocks/patches/patch-ac
index 08bc922..ad317e0 100644
--- a/codeblocks/patches/patch-ac
+++ b/codeblocks/patches/patch-ac
@@ -1,6 +1,6 @@
 $NetBSD: patch-ac,v 1.1 2008/12/05 19:47:13 jsonn Exp $
 
---- src/src/prefix.cpp.orig	2008-12-05 18:28:05.000000000 +0100
+--- src/src/prefix.cpp.orig	2013-11-17 19:33:49.000000000 +0000
 +++ src/src/prefix.cpp
 @@ -55,9 +55,6 @@ extern "C" {
  #endif /* __cplusplus */
diff --git a/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure
new file mode 100644
index 0000000..7a31194
--- /dev/null
+++ b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/plugins/contrib/wxContribItems/wxchart/configure.orig	2013-11-17 19:34:00.000000000 +0000
++++ src/plugins/contrib/wxContribItems/wxchart/configure
+@@ -5618,7 +5618,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+         fi
+ 
+-        if test "x$GCC" == "xyes"; then
++        if test "x$GCC" = "xyes"; then
+             PIC_FLAG="-dynamic -fPIC"
+         fi
+         if test "x$XLCC" = "xyes"; then
diff --git a/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure
new file mode 100644
index 0000000..b834d1e
--- /dev/null
+++ b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/plugins/contrib/wxContribItems/wxthings/configure.orig	2013-11-17 19:34:01.000000000 +0000
++++ src/plugins/contrib/wxContribItems/wxthings/configure
+@@ -4619,7 +4619,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6; 
+             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+         fi
+ 
+-        if test "x$GCC" == "xyes"; then
++        if test "x$GCC" = "xyes"; then
+             PIC_FLAG="-dynamic -fPIC"
+         fi
+         if test "x$XLCC" = "xyes"; then
diff --git a/codeblocks/patches/patch-src_sdk_wxpropgrid_configure b/codeblocks/patches/patch-src_sdk_wxpropgrid_configure
new file mode 100644
index 0000000..333a253
--- /dev/null
+++ b/codeblocks/patches/patch-src_sdk_wxpropgrid_configure
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/sdk/wxpropgrid/configure.orig	2013-11-17 19:33:44.000000000 +0000
++++ src/sdk/wxpropgrid/configure
+@@ -4628,7 +4628,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+         fi
+ 
+-        if test "x$GCC" == "xyes"; then
++        if test "x$GCC" = "xyes"; then
+             PIC_FLAG="-dynamic -fPIC"
+         fi
+         if test "x$XLCC" = "xyes"; then


Home | Main Index | Thread Index | Old Index