sip: Update to 4.11.2 (stable release).

diff --git a/pkgs/core/sip/patches/fix-linking.patch b/pkgs/core/sip/patches/fix-linking.patch
new file mode 100644 (file)
index 0000000..b4a5fae
--- /dev/null
+++ b/pkgs/core/sip/patches/fix-linking.patch
@@ -0,0 +1,11 @@
+--- a/specs/linux-g++  2009/08/31 11:59:37     1.1
++++ b/specs/linux-g++  2009/08/31 12:00:19
+@@ -53,7 +53,7 @@
+ QMAKE_LFLAGS          =
+ QMAKE_LFLAGS_RELEASE  =
+ QMAKE_LFLAGS_DEBUG    =
+-QMAKE_LFLAGS_SHLIB    = -shared
++QMAKE_LFLAGS_SHLIB    = -shared -lpython2.7
+ QMAKE_LFLAGS_PLUGIN   = $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME   = -Wl,-soname,
+ QMAKE_LFLAGS_THREAD   =

diff --git a/pkgs/core/sip/patches/no-strip.patch b/pkgs/core/sip/patches/no-strip.patch
new file mode 100644 (file)
index 0000000..033b54f
--- /dev/null
+++ b/pkgs/core/sip/patches/no-strip.patch
@@ -0,0 +1,26 @@
+Index: sip-4.8.2/specs/linux-g++
+===================================================================
+--- sip-4.8.2.orig/specs/linux-g++
++++ sip-4.8.2/specs/linux-g++
+@@ -83,7 +83,7 @@ QMAKE_COPY_DIR          = $(COPY) -r
+ QMAKE_MOVE            = mv -f
+ QMAKE_DEL_FILE                = rm -f
+ QMAKE_DEL_DIR         = rmdir
+-QMAKE_STRIP             = strip
++QMAKE_STRIP             =
+ QMAKE_STRIPFLAGS_LIB  += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS  = test -d
+ QMAKE_MKDIR           = mkdir -p
+Index: sip-4.8.2/specs/linux-lsb
+===================================================================
+--- sip-4.8.2.orig/specs/linux-lsb
++++ sip-4.8.2/specs/linux-lsb
+@@ -83,7 +83,7 @@ QMAKE_COPY_DIR          = $(COPY) -r
+ QMAKE_MOVE            = mv -f
+ QMAKE_DEL_FILE                = rm -f
+ QMAKE_DEL_DIR         = rmdir
+-QMAKE_STRIP             = strip
++QMAKE_STRIP             =
+ QMAKE_STRIPFLAGS_LIB  += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS  = test -d
+ QMAKE_MKDIR           = mkdir -p

diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm
index 96a70fb80af3d9dd505ad4577bb261e4c823012c..3b3ac15c10ac4c87aad290ee68829753973bf629 100644 (file)
--- a/pkgs/core/sip/sip.nm
+++ b/pkgs/core/sip/sip.nm
@@ -25,8 +25,9 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = sip
-PKG_VER        = 4.11.2-snapshot-5167b98767e2
-PKG_REL        = 0
+PKG_VER        = 4.11.2
+PKG_REL        = 1
+PKG_EPOCH      = 1
 
 PKG_MAINTAINER =
 PKG_GROUP      = Development/Tools
@@ -51,7 +52,9 @@ PKG_DEPS-$(PKG_NAME_REAL)-devel = sip
 
 define STAGE_BUILD
        cd $(DIR_APP) && python configure.py \
-               CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)"
+               CFLAGS+="$(CFLAGS)" CXXFLAGS+="$(CXXFLAGS)"
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 endef
+
+PKG_FILES-$(PKG_NAME)-devel += /usr/bin/sip