Merge branch 'master' of https://github.com/archlinuxarm/PKGBUILDs

community/synergy/PKGBUILD

@@ -22,7 +22,7 @@ source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
         "synergys.socket"
         "synergys.service")
 sha512sums=('3e9ca96f36573e400c9694daba026322cbf36bbabdbf69687cbadb6010834d1afd81845533775564ba7aadbf3a8be8582d9e5b9d33abfa483a174b40e084add4'
-            '1a95d4b704ab4d54a7a9ec64eef3551752432c73540d94b69e2799fe615c5a4c61dc026bf40706030da0e649afa6b8ff3b8c26da245bb7e44846907f308566f1'
+            '6fc79d78c24daaafd7e50c31581788d48fb1591105644a55584282c55c4cdee10e4f374216fecd7253030e692d358165ef349caab1675ed1d1d1f101fb46b8c0'
             'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
             'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f')
 

community/synergy/system-cryptopp.patch

@@ -1,15 +1,6 @@
-Description: Use system libcrypto++ if available
+diff -urN a/CMakeLists.txt b/CMakeLists.txt
- Rather than always use the included libcrypto++ zipped source, check
+--- a/CMakeLists.txt	2013-10-08 04:19:02.000000000 -0600
- for and use the system's libcrypto++.
++++ b/CMakeLists.txt	2013-10-18 17:46:11.290667774 -0600
-Author: Jeff Licquia <licquia@debian.org>
-Forwarded: no
-Last-Update: 2013-06-01
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: synergy-1.4.12/CMakeLists.txt
-===================================================================
---- synergy-1.4.12.orig/CMakeLists.txt	2013-06-02 02:22:35.000000000 +0000
-+++ synergy-1.4.12/CMakeLists.txt	2013-06-02 02:22:35.000000000 +0000
 @@ -75,6 +75,7 @@
  	include(CheckIncludeFileCXX)
  	include(CheckSymbolExists)
@@ -38,45 +29,61 @@ Index: synergy-1.4.12/CMakeLists.txt
  	endif()
  
          IF(HAVE_Xi)
-Index: synergy-1.4.12/tools/CMakeLists.txt
+diff -urN a/src/lib/io/CCryptoMode.h b/src/lib/io/CCryptoMode.h
-===================================================================
+--- a/src/lib/io/CCryptoMode.h	2013-05-30 07:48:08.000000000 -0600
---- synergy-1.4.12.orig/tools/CMakeLists.txt	2013-06-02 02:22:35.000000000 +0000
++++ b/src/lib/io/CCryptoMode.h	2013-10-18 17:48:48.300057303 -0600
-+++ synergy-1.4.12/tools/CMakeLists.txt	2013-06-02 02:25:44.000000000 +0000
+@@ -17,9 +17,9 @@
+ 
+ #pragma once
+ 
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <cryptopp/gcm.h>
++#include <cryptopp/modes.h>
++#include <cryptopp/aes.h>
+ #include "ECryptoMode.h"
+ #include "CString.h"
+ 
+diff -urN a/src/lib/io/CCryptoStream.h b/src/lib/io/CCryptoStream.h
+--- a/src/lib/io/CCryptoStream.h	2013-06-29 08:17:49.000000000 -0600
++++ b/src/lib/io/CCryptoStream.h	2013-10-18 17:49:02.250003064 -0600
+@@ -20,8 +20,8 @@
+ #include "BasicTypes.h"
+ #include "CStreamFilter.h"
+ #include "CCryptoMode.h"
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <cryptopp/osrng.h>
++#include <cryptopp/sha.h>
+ 
+ class CCryptoOptions;
+ 
+diff -urN a/tools/build/toolchain.py b/tools/build/toolchain.py
+--- a/tools/build/toolchain.py	2013-08-02 07:21:06.000000000 -0600
++++ b/tools/build/toolchain.py	2013-10-18 17:49:32.674884769 -0600
+@@ -67,7 +67,7 @@
+ 	macSdk = None
+ 	
+ 	# cryptoPP dir with version number
+-	cryptoPPDir = 'cryptopp562'
++	cryptoPPDir = 'cryptopp'
+ 
+ 	win32_generators = {
+ 		1 : Generator('Visual Studio 10'),
+diff -urN a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+--- a/tools/CMakeLists.txt	2013-06-04 12:22:58.000000000 -0600
++++ b/tools/CMakeLists.txt	2013-10-18 17:48:12.140197897 -0600
 @@ -13,7 +13,7 @@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
--set(cpp_dir cryptopp562)
+-set(cryptopp_dir cryptopp562)
-+set(cpp_dir cryptopp)
++set(cryptopp_dir cryptopp)
  
- file(GLOB cpp_src ${cpp_dir}/*.cpp)
+ # only compile the crypto++ files we need.
- 
+ set(cryptopp_src
-@@ -22,14 +22,16 @@
+@@ -72,16 +72,20 @@
- 	list(APPEND cpp_src ${cpp_hdr})
- endif()
- 
--file(GLOB cpp_ignore
--	${cpp_dir}/simple.cpp
--	${cpp_dir}/strciphr.cpp
--	${cpp_dir}/polynomi.cpp
--	${cpp_dir}/eprecomp.cpp
--	${cpp_dir}/eccrypto.cpp
--	${cpp_dir}/algebra.cpp)
--list(REMOVE_ITEM cpp_src ${cpp_ignore})
-+if (NOT CRYPTOPP_FOUND)
-+	file(GLOB cpp_ignore
-+		${cpp_dir}/simple.cpp
-+		${cpp_dir}/strciphr.cpp
-+		${cpp_dir}/polynomi.cpp
-+		${cpp_dir}/eprecomp.cpp
-+		${cpp_dir}/eccrypto.cpp
-+		${cpp_dir}/algebra.cpp)
-+	list(REMOVE_ITEM cpp_src ${cpp_ignore})
-+endif()
- 
- # if 64-bit windows, compile asm file.
- if (CMAKE_CL_64)
-@@ -49,16 +51,20 @@
  endif()
  
  if (UNIX)
@@ -101,52 +108,7 @@ Index: synergy-1.4.12/tools/CMakeLists.txt
  	endif()
  endif()
  
--add_library(cryptopp STATIC ${cpp_src})
+-add_library(cryptopp STATIC ${cryptopp_src})
 +if (NOT CRYPTOPP_FOUND)
 +        add_library(cryptopp STATIC ${cpp_src})
 +endif()
-Index: synergy-1.4.12/src/lib/synergy/CCryptoMode.h
-===================================================================
---- synergy-1.4.12.orig/src/lib/synergy/CCryptoMode.h	2013-06-02 02:22:35.000000000 +0000
-+++ synergy-1.4.12/src/lib/synergy/CCryptoMode.h	2013-06-02 02:22:35.000000000 +0000
-@@ -17,9 +17,9 @@
- 
- #pragma once
- 
--#include <cryptopp562/gcm.h>
--#include <cryptopp562/modes.h>
--#include <cryptopp562/aes.h>
-+#include <cryptopp/gcm.h>
-+#include <cryptopp/modes.h>
-+#include <cryptopp/aes.h>
- #include "ECryptoMode.h"
- #include "CString.h"
- 
-Index: synergy-1.4.12/src/lib/synergy/CCryptoStream.h
-===================================================================
---- synergy-1.4.12.orig/src/lib/synergy/CCryptoStream.h	2013-06-02 02:22:35.000000000 +0000
-+++ synergy-1.4.12/src/lib/synergy/CCryptoStream.h	2013-06-02 02:22:35.000000000 +0000
-@@ -20,8 +20,8 @@
- #include "BasicTypes.h"
- #include "CStreamFilter.h"
- #include "CCryptoMode.h"
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <cryptopp/osrng.h>
-+#include <cryptopp/sha.h>
- 
- class CCryptoOptions;
- 
-Index: synergy-1.4.12/tools/build/toolchain.py
-===================================================================
---- synergy-1.4.12.orig/tools/build/toolchain.py	2013-06-01 22:55:47.000000000 +0000
-+++ synergy-1.4.12/tools/build/toolchain.py	2013-06-02 02:25:00.000000000 +0000
-@@ -73,7 +73,7 @@
- 	macSdk = None
- 	
- 	# cryptoPP dir with version number
--	cryptoPPDir = 'cryptopp562'
-+	cryptoPPDir = 'cryptopp'
- 
- 	win32_generators = {
- 		1 : Generator('Visual Studio 10'),

extra/qt4/PKGBUILD

@@ -10,16 +10,16 @@
 
 pkgname=qt4
 pkgver=4.8.5
-pkgrel=3
+pkgrel=3.1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
-depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
+depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus'
         'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
         'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2'
-             'mesa-libgl')
+             'mesa')
 optdepends=('qtchooser: set the default Qt toolkit'
             'postgresql-libs: PostgreSQL driver'
             'libmariadbclient: MariaDB driver'