[arch-commits] Commit in qt3/trunk (PKGBUILD qt-x11-free-3.3.5-makelibshared.patch)

[Eric Bélanger]

    Date: Friday, October 25, 2013 @ 20:35:59
  Author: eric
Revision: 197417

upgpkg: qt3 1:3.3.8b-7

Rebuild without static libraries, Add patch to build shared libraries

Added:
  qt3/trunk/qt-x11-free-3.3.5-makelibshared.patch
Modified:
  qt3/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   12 +++++---
 qt-x11-free-3.3.5-makelibshared.patch |   48 ++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-25 18:23:06 UTC (rev 197416)
+++ PKGBUILD	2013-10-25 18:35:59 UTC (rev 197417)
@@ -3,7 +3,7 @@
 
 pkgname=qt3
 pkgver=3.3.8b
-pkgrel=6
+pkgrel=7
 epoch=1
 pkgdesc="A cross-platform application and UI framework"
 arch=('i686' 'x86_64')
@@ -16,10 +16,11 @@
             'libmariadbclient: MariaDB driver'
             'postgresql-libs: PostgreSQL driver'
             'unixodbc: ODBC driver')
-options=('!libtool' '!docs')
+options=('!docs')
 source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz
         qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
-        eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
+        eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch 
+        qt-x11-free-3.3.5-makelibshared.patch)
 sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
           '3d19510c46016a1a211d97bf8f82b01498b1b33c'
           '33418e5b117458af23c72cdbffc0c339bc34bdc4'
@@ -26,7 +27,8 @@
           '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
           '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
           '1346320614f6f86fbeb10b9fbad721dea29f5b61'
-          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
+          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f'
+          'e89720eac87c3e925d0efae6a16f334c5159e4f6')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
@@ -49,6 +51,8 @@
   patch -p1 -i "${srcdir}"/gcc-4.6.patch
   patch -p0 -i "${srcdir}"/qt3-png15.patch 
  
+  patch -p1 -i "${srcdir}"/qt-x11-free-3.3.5-makelibshared.patch
+
   sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf
   sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
   sed -i "s|read acceptance|acceptance=yes|" configure

Added: qt-x11-free-3.3.5-makelibshared.patch
===================================================================
--- qt-x11-free-3.3.5-makelibshared.patch	                        (rev 0)
+++ qt-x11-free-3.3.5-makelibshared.patch	2013-10-25 18:35:59 UTC (rev 197417)
@@ -0,0 +1,48 @@
+--- qt-x11-free-3.3.5/tools/assistant/lib/lib.pro.orig	2005-10-21 10:09:12.000000000 -0200
++++ qt-x11-free-3.3.5/tools/assistant/lib/lib.pro	2005-10-21 10:09:34.000000000 -0200
+@@ -3,8 +3,7 @@
+ VERSION		= 1.0
+ 
+ CONFIG		+= qt warn_on release
+-CONFIG		+= staticlib
+-CONFIG		-= dll
++CONFIG		+= dll
+ 
+ SOURCES		= qassistantclient.cpp
+ HEADERS         += $$QT_SOURCE_TREE/include/qassistantclient.h
+*** qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro	2003-12-20 22:48:51.000000000 -0200
+--- qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro.new	2005-12-06 18:47:04.000000000 -0200
+***************
+*** 1,6 ****
+  TEMPLATE	= lib
+! CONFIG		+= qt warn_on staticlib
+! CONFIG		-= dll
+  HEADERS		= editor.h  \
+  		  parenmatcher.h  \
+  		  completion.h \
+--- 1,6 ----
+  TEMPLATE	= lib
+! CONFIG		+= qt warn_on
+! CONFIG		+= dll
+  HEADERS		= editor.h  \
+  		  parenmatcher.h  \
+  		  completion.h \
+*** qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro	2004-04-29 19:31:32.000000000 -0300
+--- qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro.new	2005-12-06 18:46:29.000000000 -0200
+***************
+*** 1,7 ****
+  TEMPLATE	= lib
+  
+! CONFIG		+= qt warn_on staticlib qmake_cache
+! CONFIG 		-= dll
+  !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
+     CONFIG          -= staticlib
+     CONFIG          += dll
+--- 1,7 ----
+  TEMPLATE	= lib
+  
+! CONFIG		+= qt warn_on qmake_cache
+! CONFIG 		+= dll
+  !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
+     CONFIG          -= staticlib
+     CONFIG          += dll