[arch-commits] Commit in licq/repos/staging-x86_64 (4 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sat Dec 30 23:25:28 UTC 2017


    Date: Saturday, December 30, 2017 @ 23:25:26
  Author: bpiotrowski
Revision: 313819

archrelease: copy trunk to staging-x86_64

Added:
  licq/repos/staging-x86_64/PKGBUILD
    (from rev 313818, licq/trunk/PKGBUILD)
  licq/repos/staging-x86_64/licq-gcc6.patch
    (from rev 313818, licq/trunk/licq-gcc6.patch)
Deleted:
  licq/repos/staging-x86_64/PKGBUILD
  licq/repos/staging-x86_64/licq-gcc6.patch

-----------------+
 PKGBUILD        |  106 +++++++++++++++++++++++++++---------------------------
 licq-gcc6.patch |   48 ++++++++++++------------
 2 files changed, 77 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-30 23:19:37 UTC (rev 313818)
+++ PKGBUILD	2017-12-30 23:25:26 UTC (rev 313819)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
-
-pkgname=licq
-pkgver=1.8.2
-pkgrel=19
-pkgdesc="Advanced graphical ICQ clone and more for Unix"
-arch=('x86_64')
-url="http://www.licq.org"
-license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt4' 'openssl-1.0')
-makedepends=('cmake' 'boost' 'optipng')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2 licq-gcc6.patch)
-md5sums=('46af2bc95865ee61a103d27812fe6e6a'
-         '8af303d8d31573246470f0ba0ccba428')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  mkdir build
-
-  # Fix invalid PNG images to work with libpng 1.6
-  # https://github.com/licq-im/licq/pull/32
-  optipng -quiet -force -fix plugins/qt4-gui/share/skins/Mirabilis/*.png
-
-  # Fix build with GCC 6
-  patch -p1 -i ../licq-gcc6.patch
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  local licq_plugins="auto-reply icq rms msn qt4-gui" # osd jabber aosd
-  
-  local plugins="" _plugin
-  for _plugin in ${licq_plugins}; do
-    plugins+=" ${_plugin}\/CMakeLists.txt"
-  done
-  sed -i -e "s/file(GLOB cmake_plugins.*$/set(cmake_plugins ${plugins})/" plugins/CMakeLists.txt
-
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_FIFO=ON -DBUILD_PLUGINS=ON -DBUILD_TESTS=OFF \
-        -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
-        -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
-        -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so \
-        ..
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-}

Copied: licq/repos/staging-x86_64/PKGBUILD (from rev 313818, licq/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-30 23:25:26 UTC (rev 313819)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+
+pkgname=licq
+pkgver=1.8.2
+pkgrel=19
+pkgdesc="Advanced graphical ICQ clone and more for Unix"
+arch=('x86_64')
+url="http://www.licq.org"
+license=('GPL')
+depends=('boost-libs' 'gpgme' 'libxss' 'qt4' 'openssl-1.0')
+makedepends=('cmake' 'boost' 'optipng')
+source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2 licq-gcc6.patch)
+md5sums=('46af2bc95865ee61a103d27812fe6e6a'
+         '8af303d8d31573246470f0ba0ccba428')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  mkdir build
+
+  # Fix invalid PNG images to work with libpng 1.6
+  # https://github.com/licq-im/licq/pull/32
+  optipng -quiet -force -fix plugins/qt4-gui/share/skins/Mirabilis/*.png
+
+  # Fix build with GCC 6
+  patch -p1 -i ../licq-gcc6.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  local licq_plugins="auto-reply icq rms msn qt4-gui" # osd jabber aosd
+  
+  local plugins="" _plugin
+  for _plugin in ${licq_plugins}; do
+    plugins+=" ${_plugin}\/CMakeLists.txt"
+  done
+  sed -i -e "s/file(GLOB cmake_plugins.*$/set(cmake_plugins ${plugins})/" plugins/CMakeLists.txt
+
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_FIFO=ON -DBUILD_PLUGINS=ON -DBUILD_TESTS=OFF \
+        -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
+        -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
+        -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so \
+        ..
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: licq-gcc6.patch
===================================================================
--- licq-gcc6.patch	2017-12-30 23:19:37 UTC (rev 313818)
+++ licq-gcc6.patch	2017-12-30 23:25:26 UTC (rev 313819)
@@ -1,24 +0,0 @@
---- licq-1.8.2/src/licq.cpp.orig	2016-05-12 15:27:35.927500283 +0000
-+++ licq-1.8.2/src/licq.cpp	2016-05-12 15:28:01.107415744 +0000
-@@ -568,18 +568,18 @@
-         if (!licqConf.get(szKey, pluginName))
-           continue;
- 
--        bool loaded = LoadPlugin(pluginName, argc, argv);
-+        bool loaded= (bool)LoadPlugin(pluginName, argc, argv);
- 
-         // Make upgrade from 1.3.x and older easier by automatically switching from kde/qt-gui to kde4/qt4-gui
-         if (!loaded && pluginName == "kde-gui")
-         {
-           gLog.warning(tr("Plugin kde-gui is no longer available, trying to load kde4-gui instead."));
--          loaded = LoadPlugin("kde4-gui", argc, argv);
-+          loaded= (bool)LoadPlugin("kde4-gui", argc, argv);
-         }
-         if (!loaded && (pluginName == "qt-gui" || pluginName == "kde-gui"))
-         {
-           gLog.warning(tr("Plugin %s is no longer available, trying to load qt4-gui instead."), pluginName.c_str());
--          loaded = LoadPlugin("qt4-gui", argc, argv);
-+          loaded= (bool)LoadPlugin("qt4-gui", argc, argv);
-         }
- 
-         if (!loaded)

Copied: licq/repos/staging-x86_64/licq-gcc6.patch (from rev 313818, licq/trunk/licq-gcc6.patch)
===================================================================
--- licq-gcc6.patch	                        (rev 0)
+++ licq-gcc6.patch	2017-12-30 23:25:26 UTC (rev 313819)
@@ -0,0 +1,24 @@
+--- licq-1.8.2/src/licq.cpp.orig	2016-05-12 15:27:35.927500283 +0000
++++ licq-1.8.2/src/licq.cpp	2016-05-12 15:28:01.107415744 +0000
+@@ -568,18 +568,18 @@
+         if (!licqConf.get(szKey, pluginName))
+           continue;
+ 
+-        bool loaded = LoadPlugin(pluginName, argc, argv);
++        bool loaded= (bool)LoadPlugin(pluginName, argc, argv);
+ 
+         // Make upgrade from 1.3.x and older easier by automatically switching from kde/qt-gui to kde4/qt4-gui
+         if (!loaded && pluginName == "kde-gui")
+         {
+           gLog.warning(tr("Plugin kde-gui is no longer available, trying to load kde4-gui instead."));
+-          loaded = LoadPlugin("kde4-gui", argc, argv);
++          loaded= (bool)LoadPlugin("kde4-gui", argc, argv);
+         }
+         if (!loaded && (pluginName == "qt-gui" || pluginName == "kde-gui"))
+         {
+           gLog.warning(tr("Plugin %s is no longer available, trying to load qt4-gui instead."), pluginName.c_str());
+-          loaded = LoadPlugin("qt4-gui", argc, argv);
++          loaded= (bool)LoadPlugin("qt4-gui", argc, argv);
+         }
+ 
+         if (!loaded)



More information about the arch-commits mailing list