Date: Sunday, December 6, 2015 @ 10:19:58
Author: foutrelis
Revision: 252681
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
qt-assistant-compat/repos/staging-i686/
qt-assistant-compat/repos/staging-i686/PKGBUILD
(from rev 252680, qt-assistant-compat/trunk/PKGBUILD)
qt-assistant-compat/repos/staging-i686/debian_patches_01_build_system.diff
(from rev 252680,
qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
qt-assistant-compat/repos/staging-x86_64/
qt-assistant-compat/repos/staging-x86_64/PKGBUILD
(from rev 252680, qt-assistant-compat/trunk/PKGBUILD)
qt-assistant-compat/repos/staging-x86_64/debian_patches_01_build_system.diff
(from rev 252680,
qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
----------------------------------------------------+
staging-i686/PKGBUILD | 56 +++++++++++++++++++
staging-i686/debian_patches_01_build_system.diff | 48 ++++++++++++++++
staging-x86_64/PKGBUILD | 56 +++++++++++++++++++
staging-x86_64/debian_patches_01_build_system.diff | 48 ++++++++++++++++
4 files changed, 208 insertions(+)
Copied: qt-assistant-compat/repos/staging-i686/PKGBUILD (from rev 252680,
qt-assistant-compat/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-06 09:19:58 UTC (rev 252681)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=qt-assistant-compat
+pkgver=4.6.3
+pkgrel=6
+pkgdesc="compat version of Qt Assistant"
+url="http://qt-project.org/";
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+depends=('qt4')
+source=('http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
+ 'debian_patches_01_build_system.diff')
+md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
+ '1b55290dc9fab0c035797e9301d2fa61')
+
+prepare() {
+ cd
${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+ patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
+}
+
+build() {
+ cd
${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+
+ cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
+ rm -f translations/assistant_adp_*.qm
+
+ qmake-qt4 CONFIG+=create_prl
+ make
+ cd ../translations; lrelease-qt4 assistant_adp_*.ts
+ cd ..
+ qmake-qt4 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/qt4/translations/
+ install -p -m0644 translations/assistant_adp_*.qm \
+ ${pkgdir}/usr/share/qt4/translations/
+
+ # Install prf file
+ install -D -p -m0644 features/assistant.prf \
+ ${pkgdir}/usr/share/qt4/mkspecs/features/assistant.prf
+}
Copied:
qt-assistant-compat/repos/staging-i686/debian_patches_01_build_system.diff
(from rev 252680, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
===================================================================
--- staging-i686/debian_patches_01_build_system.diff
(rev 0)
+++ staging-i686/debian_patches_01_build_system.diff 2015-12-06 09:19:58 UTC
(rev 252681)
@@ -0,0 +1,48 @@
+Description: several workarounds for the build system which is completely
broken
+Author: Fathi Boudra <[email protected]>
+
+--- 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/staging-x86_64/PKGBUILD (from rev 252680,
qt-assistant-compat/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-06 09:19:58 UTC (rev 252681)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=qt-assistant-compat
+pkgver=4.6.3
+pkgrel=6
+pkgdesc="compat version of Qt Assistant"
+url="http://qt-project.org/";
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+depends=('qt4')
+source=('http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
+ 'debian_patches_01_build_system.diff')
+md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
+ '1b55290dc9fab0c035797e9301d2fa61')
+
+prepare() {
+ cd
${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+ patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
+}
+
+build() {
+ cd
${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+
+ cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
+ rm -f translations/assistant_adp_*.qm
+
+ qmake-qt4 CONFIG+=create_prl
+ make
+ cd ../translations; lrelease-qt4 assistant_adp_*.ts
+ cd ..
+ qmake-qt4 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/qt4/translations/
+ install -p -m0644 translations/assistant_adp_*.qm \
+ ${pkgdir}/usr/share/qt4/translations/
+
+ # Install prf file
+ install -D -p -m0644 features/assistant.prf \
+ ${pkgdir}/usr/share/qt4/mkspecs/features/assistant.prf
+}
Copied:
qt-assistant-compat/repos/staging-x86_64/debian_patches_01_build_system.diff
(from rev 252680, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
===================================================================
--- staging-x86_64/debian_patches_01_build_system.diff
(rev 0)
+++ staging-x86_64/debian_patches_01_build_system.diff 2015-12-06 09:19:58 UTC
(rev 252681)
@@ -0,0 +1,48 @@
+Description: several workarounds for the build system which is completely
broken
+Author: Fathi Boudra <[email protected]>
+
+--- 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"
