summaryrefslogtreecommitdiff
path: root/extra/qt3
diff options
context:
space:
mode:
Diffstat (limited to 'extra/qt3')
-rw-r--r--extra/qt3/PKGBUILD14
-rw-r--r--extra/qt3/qt-x11-free-3.3.5-makelibshared.patch48
2 files changed, 57 insertions, 5 deletions
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index 942959ad4..dead707dd 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193687 2013-08-28 00:06:06Z eric $
+# $Id: PKGBUILD 197418 2013-10-25 18:37:20Z eric $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
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,17 +16,19 @@ optdepends=('qtchooser: set the default Qt toolkit'
'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'
'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 @@ prepare() {
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
diff --git a/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch
new file mode 100644
index 000000000..fd4adf7f0
--- /dev/null
+++ b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch
@@ -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