[arch-commits] Commit in qt-assistant-compat/repos (8 files)

Pierre Schmitz pierre at archlinux.org
Wed Feb 8 15:53:43 EST 2012


    Date: Wednesday, February 8, 2012 @ 15:53:42
  Author: pierre
Revision: 149629

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qt-assistant-compat/repos/extra-i686/PKGBUILD
    (from rev 149628, qt-assistant-compat/trunk/PKGBUILD)
  qt-assistant-compat/repos/extra-i686/debian_patches_01_build_system.diff
    (from rev 149628, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
  qt-assistant-compat/repos/extra-x86_64/PKGBUILD
    (from rev 149628, qt-assistant-compat/trunk/PKGBUILD)
  qt-assistant-compat/repos/extra-x86_64/debian_patches_01_build_system.diff
    (from rev 149628, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
Deleted:
  qt-assistant-compat/repos/extra-i686/PKGBUILD
  qt-assistant-compat/repos/extra-i686/debian_patches_01_build_system.diff
  qt-assistant-compat/repos/extra-x86_64/PKGBUILD
  qt-assistant-compat/repos/extra-x86_64/debian_patches_01_build_system.diff

--------------------------------------------------+
 extra-i686/PKGBUILD                              |  109 ++++++++++-----------
 extra-i686/debian_patches_01_build_system.diff   |   96 +++++++++---------
 extra-x86_64/PKGBUILD                            |  109 ++++++++++-----------
 extra-x86_64/debian_patches_01_build_system.diff |   96 +++++++++---------
 4 files changed, 204 insertions(+), 206 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-08 20:53:15 UTC (rev 149628)
+++ extra-i686/PKGBUILD	2012-02-08 20:53:42 UTC (rev 149629)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=qt-assistant-compat
-pkgver=4.6.3
-pkgrel=1
-pkgdesk="compat version of Qt Assistant"
-url="http://qt.nokia.com/"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-depends=('qt')
-source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
-	'debian_patches_01_build_system.diff')
-md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
-         '1b55290dc9fab0c035797e9301d2fa61')
-
-# separate package function does not really work here due to broken build files
-build() {
-	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
-
- 	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
-        
-	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
-        rm -f translations/assistant_adp_*.qm
-
-	qmake CONFIG+=create_prl
-        make
-        cd  ../translations; lrelease assistant_adp_*.ts
-        cd ..
-        qmake CONFIG+=create_prl
-        make
-}
-
-package(){
-        cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
-
-      	make install INSTALL_ROOT=${pkgdir}
-        cd lib
-        make install INSTALL_ROOT=${pkgdir}
-        cd ..
-
-	# Fix wrong path in prl file
-	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \
-	    ${pkgdir}/usr/lib/libQtAssistantClient.prl
-
-	# Install translations
-	install -d ${pkgdir}/usr/share/qt/translations/
-	install -p -m0644 translations/assistant_adp_*.qm \
-	    ${pkgdir}/usr/share/qt/translations/
-
-	# Install prf file
-	install -D -p -m0644 features/assistant.prf \
-	    ${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
-
-}

Copied: qt-assistant-compat/repos/extra-i686/PKGBUILD (from rev 149628, qt-assistant-compat/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-08 20:53:42 UTC (rev 149629)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=qt-assistant-compat
+pkgver=4.6.3
+pkgrel=2
+pkgdesc="compat version of Qt Assistant"
+url="http://qt.nokia.com/"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+depends=('qt')
+source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
+        'debian_patches_01_build_system.diff')
+md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
+         '1b55290dc9fab0c035797e9301d2fa61')
+
+# separate package function does not really work here due to broken build files
+build() {
+	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+
+	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
+
+	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
+	rm -f translations/assistant_adp_*.qm
+
+	qmake CONFIG+=create_prl
+	make
+	cd  ../translations; lrelease assistant_adp_*.ts
+	cd ..
+	qmake CONFIG+=create_prl
+	make
+}
+
+package() {
+	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+
+	make install INSTALL_ROOT=${pkgdir}
+	cd lib
+	make install INSTALL_ROOT=${pkgdir}
+	cd ..
+
+	# Fix wrong path in prl file
+	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \
+		${pkgdir}/usr/lib/libQtAssistantClient.prl
+
+	# Install translations
+	install -d ${pkgdir}/usr/share/qt/translations/
+	install -p -m0644 translations/assistant_adp_*.qm \
+		${pkgdir}/usr/share/qt/translations/
+
+	# Install prf file
+	install -D -p -m0644 features/assistant.prf \
+		${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
+}

Deleted: extra-i686/debian_patches_01_build_system.diff
===================================================================
--- extra-i686/debian_patches_01_build_system.diff	2012-02-08 20:53:15 UTC (rev 149628)
+++ extra-i686/debian_patches_01_build_system.diff	2012-02-08 20:53:42 UTC (rev 149629)
@@ -1,48 +0,0 @@
-Description: several workarounds for the build system which is completely broken
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/compat.pro
-+++ b/compat.pro
-@@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad
-     translations/assistant_adp_zh_CN.ts \
-     translations/assistant_adp_zh_TW.ts
- 
--unix:!contains(QT_CONFIG, zlib):LIBS += -lz
--
- contains(CONFIG, static): {
-     win32 {
-         exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
-@@ -81,3 +79,7 @@ contains(CONFIG, static): {
-         }        
-     }
- }
-+
-+target.path = $$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
---- a/lib/lib.pro
-+++ b/lib/lib.pro
-@@ -16,8 +16,8 @@ HEADERS         = qassistantclient.h \
-                   qassistantclient_global.h
- SOURCES         = qassistantclient.cpp
- 
--DESTDIR                = ../../../../lib
--DLLDESTDIR             = ../../../../bin
-+DESTDIR                = lib
-+DLLDESTDIR             = bin
- 
- unix {
-         QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
-@@ -62,7 +62,7 @@ win32 {
- }
- 
- qt_install_headers {
--    assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
-+    assistant_headers.files = qassistantclient.h qassistantclient_global.h
-     assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant
-     INSTALLS        += assistant_headers
- }
---- /dev/null
-+++ b/lib/QtAssistant/qassistantclient_global.h
-@@ -0,0 +1 @@
-+#include "../qassistantclient_global.h"

Copied: qt-assistant-compat/repos/extra-i686/debian_patches_01_build_system.diff (from rev 149628, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
===================================================================
--- extra-i686/debian_patches_01_build_system.diff	                        (rev 0)
+++ extra-i686/debian_patches_01_build_system.diff	2012-02-08 20:53:42 UTC (rev 149629)
@@ -0,0 +1,48 @@
+Description: several workarounds for the build system which is completely broken
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/compat.pro
++++ b/compat.pro
+@@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad
+     translations/assistant_adp_zh_CN.ts \
+     translations/assistant_adp_zh_TW.ts
+ 
+-unix:!contains(QT_CONFIG, zlib):LIBS += -lz
+-
+ contains(CONFIG, static): {
+     win32 {
+         exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
+@@ -81,3 +79,7 @@ contains(CONFIG, static): {
+         }        
+     }
+ }
++
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+--- a/lib/lib.pro
++++ b/lib/lib.pro
+@@ -16,8 +16,8 @@ HEADERS         = qassistantclient.h \
+                   qassistantclient_global.h
+ SOURCES         = qassistantclient.cpp
+ 
+-DESTDIR                = ../../../../lib
+-DLLDESTDIR             = ../../../../bin
++DESTDIR                = lib
++DLLDESTDIR             = bin
+ 
+ unix {
+         QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
+@@ -62,7 +62,7 @@ win32 {
+ }
+ 
+ qt_install_headers {
+-    assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
++    assistant_headers.files = qassistantclient.h qassistantclient_global.h
+     assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant
+     INSTALLS        += assistant_headers
+ }
+--- /dev/null
++++ b/lib/QtAssistant/qassistantclient_global.h
+@@ -0,0 +1 @@
++#include "../qassistantclient_global.h"

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-08 20:53:15 UTC (rev 149628)
+++ extra-x86_64/PKGBUILD	2012-02-08 20:53:42 UTC (rev 149629)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=qt-assistant-compat
-pkgver=4.6.3
-pkgrel=1
-pkgdesk="compat version of Qt Assistant"
-url="http://qt.nokia.com/"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-depends=('qt')
-source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
-	'debian_patches_01_build_system.diff')
-md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
-         '1b55290dc9fab0c035797e9301d2fa61')
-
-# separate package function does not really work here due to broken build files
-build() {
-	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
-
- 	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
-        
-	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
-        rm -f translations/assistant_adp_*.qm
-
-	qmake CONFIG+=create_prl
-        make
-        cd  ../translations; lrelease assistant_adp_*.ts
-        cd ..
-        qmake CONFIG+=create_prl
-        make
-}
-
-package(){
-        cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
-
-      	make install INSTALL_ROOT=${pkgdir}
-        cd lib
-        make install INSTALL_ROOT=${pkgdir}
-        cd ..
-
-	# Fix wrong path in prl file
-	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \
-	    ${pkgdir}/usr/lib/libQtAssistantClient.prl
-
-	# Install translations
-	install -d ${pkgdir}/usr/share/qt/translations/
-	install -p -m0644 translations/assistant_adp_*.qm \
-	    ${pkgdir}/usr/share/qt/translations/
-
-	# Install prf file
-	install -D -p -m0644 features/assistant.prf \
-	    ${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
-
-}

Copied: qt-assistant-compat/repos/extra-x86_64/PKGBUILD (from rev 149628, qt-assistant-compat/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-08 20:53:42 UTC (rev 149629)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=qt-assistant-compat
+pkgver=4.6.3
+pkgrel=2
+pkgdesc="compat version of Qt Assistant"
+url="http://qt.nokia.com/"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+depends=('qt')
+source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
+        'debian_patches_01_build_system.diff')
+md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
+         '1b55290dc9fab0c035797e9301d2fa61')
+
+# separate package function does not really work here due to broken build files
+build() {
+	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+
+	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
+
+	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
+	rm -f translations/assistant_adp_*.qm
+
+	qmake CONFIG+=create_prl
+	make
+	cd  ../translations; lrelease assistant_adp_*.ts
+	cd ..
+	qmake CONFIG+=create_prl
+	make
+}
+
+package() {
+	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+
+	make install INSTALL_ROOT=${pkgdir}
+	cd lib
+	make install INSTALL_ROOT=${pkgdir}
+	cd ..
+
+	# Fix wrong path in prl file
+	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \
+		${pkgdir}/usr/lib/libQtAssistantClient.prl
+
+	# Install translations
+	install -d ${pkgdir}/usr/share/qt/translations/
+	install -p -m0644 translations/assistant_adp_*.qm \
+		${pkgdir}/usr/share/qt/translations/
+
+	# Install prf file
+	install -D -p -m0644 features/assistant.prf \
+		${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
+}

Deleted: extra-x86_64/debian_patches_01_build_system.diff
===================================================================
--- extra-x86_64/debian_patches_01_build_system.diff	2012-02-08 20:53:15 UTC (rev 149628)
+++ extra-x86_64/debian_patches_01_build_system.diff	2012-02-08 20:53:42 UTC (rev 149629)
@@ -1,48 +0,0 @@
-Description: several workarounds for the build system which is completely broken
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/compat.pro
-+++ b/compat.pro
-@@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad
-     translations/assistant_adp_zh_CN.ts \
-     translations/assistant_adp_zh_TW.ts
- 
--unix:!contains(QT_CONFIG, zlib):LIBS += -lz
--
- contains(CONFIG, static): {
-     win32 {
-         exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
-@@ -81,3 +79,7 @@ contains(CONFIG, static): {
-         }        
-     }
- }
-+
-+target.path = $$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
---- a/lib/lib.pro
-+++ b/lib/lib.pro
-@@ -16,8 +16,8 @@ HEADERS         = qassistantclient.h \
-                   qassistantclient_global.h
- SOURCES         = qassistantclient.cpp
- 
--DESTDIR                = ../../../../lib
--DLLDESTDIR             = ../../../../bin
-+DESTDIR                = lib
-+DLLDESTDIR             = bin
- 
- unix {
-         QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
-@@ -62,7 +62,7 @@ win32 {
- }
- 
- qt_install_headers {
--    assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
-+    assistant_headers.files = qassistantclient.h qassistantclient_global.h
-     assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant
-     INSTALLS        += assistant_headers
- }
---- /dev/null
-+++ b/lib/QtAssistant/qassistantclient_global.h
-@@ -0,0 +1 @@
-+#include "../qassistantclient_global.h"

Copied: qt-assistant-compat/repos/extra-x86_64/debian_patches_01_build_system.diff (from rev 149628, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
===================================================================
--- extra-x86_64/debian_patches_01_build_system.diff	                        (rev 0)
+++ extra-x86_64/debian_patches_01_build_system.diff	2012-02-08 20:53:42 UTC (rev 149629)
@@ -0,0 +1,48 @@
+Description: several workarounds for the build system which is completely broken
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/compat.pro
++++ b/compat.pro
+@@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad
+     translations/assistant_adp_zh_CN.ts \
+     translations/assistant_adp_zh_TW.ts
+ 
+-unix:!contains(QT_CONFIG, zlib):LIBS += -lz
+-
+ contains(CONFIG, static): {
+     win32 {
+         exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
+@@ -81,3 +79,7 @@ contains(CONFIG, static): {
+         }        
+     }
+ }
++
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+--- a/lib/lib.pro
++++ b/lib/lib.pro
+@@ -16,8 +16,8 @@ HEADERS         = qassistantclient.h \
+                   qassistantclient_global.h
+ SOURCES         = qassistantclient.cpp
+ 
+-DESTDIR                = ../../../../lib
+-DLLDESTDIR             = ../../../../bin
++DESTDIR                = lib
++DLLDESTDIR             = bin
+ 
+ unix {
+         QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
+@@ -62,7 +62,7 @@ win32 {
+ }
+ 
+ qt_install_headers {
+-    assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
++    assistant_headers.files = qassistantclient.h qassistantclient_global.h
+     assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant
+     INSTALLS        += assistant_headers
+ }
+--- /dev/null
++++ b/lib/QtAssistant/qassistantclient_global.h
+@@ -0,0 +1 @@
++#include "../qassistantclient_global.h"



More information about the arch-commits mailing list