[arch-commits] Commit in qt-assistant-compat/repos/extra-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Tue Jun 5 17:02:31 UTC 2018
Date: Tuesday, June 5, 2018 @ 17:02:30
Author: felixonmars
Revision: 325928
archrelease: copy trunk to extra-x86_64
Added:
qt-assistant-compat/repos/extra-x86_64/PKGBUILD
(from rev 325927, qt-assistant-compat/trunk/PKGBUILD)
qt-assistant-compat/repos/extra-x86_64/debian_patches_01_build_system.diff
(from rev 325927, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
Deleted:
qt-assistant-compat/repos/extra-x86_64/PKGBUILD
qt-assistant-compat/repos/extra-x86_64/debian_patches_01_build_system.diff
-------------------------------------+
PKGBUILD | 112 +++++++++++++++++-----------------
debian_patches_01_build_system.diff | 96 ++++++++++++++---------------
2 files changed, 104 insertions(+), 104 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-05 17:02:16 UTC (rev 325927)
+++ PKGBUILD 2018-06-05 17:02:30 UTC (rev 325928)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=qt-assistant-compat
-pkgver=4.6.3
-pkgrel=7
-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/extra-x86_64/PKGBUILD (from rev 325927, qt-assistant-compat/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-05 17:02:30 UTC (rev 325928)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=qt-assistant-compat
+pkgver=4.6.3
+pkgrel=8
+pkgdesc="compat version of Qt Assistant"
+url="http://qt-project.org/"
+arch=('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')
+sha512sums=('a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106'
+ '241b5937adafca52420ddcd087bd32ae42c45f5764a02eb4e68c5d0bca41fb7382d75b759fece1072c0d3d2c7e924589b99807c92a41a5148cda5d9b3560d34b')
+
+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
+}
Deleted: debian_patches_01_build_system.diff
===================================================================
--- debian_patches_01_build_system.diff 2018-06-05 17:02:16 UTC (rev 325927)
+++ debian_patches_01_build_system.diff 2018-06-05 17:02:30 UTC (rev 325928)
@@ -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 325927, qt-assistant-compat/trunk/debian_patches_01_build_system.diff)
===================================================================
--- debian_patches_01_build_system.diff (rev 0)
+++ debian_patches_01_build_system.diff 2018-06-05 17:02:30 UTC (rev 325928)
@@ -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