diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 5278c722d..09ad9b263 100644 --- a/community/synergy/PKGBUILD +++ b/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') diff --git a/community/synergy/system-cryptopp.patch b/community/synergy/system-cryptopp.patch index bad4b01bd..d91fce362 100644 --- a/community/synergy/system-cryptopp.patch +++ b/community/synergy/system-cryptopp.patch @@ -1,15 +1,6 @@ -Description: Use system libcrypto++ if available - Rather than always use the included libcrypto++ zipped source, check - for and use the system's libcrypto++. -Author: Jeff Licquia -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 +diff -urN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2013-10-08 04:19:02.000000000 -0600 ++++ b/CMakeLists.txt 2013-10-18 17:46:11.290667774 -0600 @@ -75,6 +75,7 @@ include(CheckIncludeFileCXX) include(CheckSymbolExists) @@ -19,10 +10,10 @@ Index: synergy-1.4.12/CMakeLists.txt check_include_file_cxx(istream HAVE_ISTREAM) check_include_file_cxx(ostream HAVE_OSTREAM) @@ -204,6 +205,8 @@ - check_library_exists("Xi" XISelectEvents "" HAVE_Xi) - check_library_exists("Xrandr" XRRQueryExtension "" HAVE_Xrandr) + check_library_exists("Xi" XISelectEvents "" HAVE_Xi) + check_library_exists("Xrandr" XRRQueryExtension "" HAVE_Xrandr) -+ pkg_search_module(CRYPTOPP libcrypto++) ++ pkg_search_module(CRYPTOPP libcrypto++) + if (HAVE_ICE) @@ -31,84 +22,16 @@ Index: synergy-1.4.12/CMakeLists.txt list(APPEND libs Xrandr) endif() -+ if (HAVE_CRYPTOPP) -+ list(APPEND libs CRYPTOPP_LIBRARIES) -+ endif() ++ if (HAVE_CRYPTOPP) ++ list(APPEND libs CRYPTOPP_LIBRARIES) ++ endif() + endif() IF(HAVE_Xi) -Index: synergy-1.4.12/tools/CMakeLists.txt -=================================================================== ---- synergy-1.4.12.orig/tools/CMakeLists.txt 2013-06-02 02:22:35.000000000 +0000 -+++ synergy-1.4.12/tools/CMakeLists.txt 2013-06-02 02:25:44.000000000 +0000 -@@ -13,7 +13,7 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - --set(cpp_dir cryptopp562) -+set(cpp_dir cryptopp) - - file(GLOB cpp_src ${cpp_dir}/*.cpp) - -@@ -22,14 +22,16 @@ - 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) -- add_definitions(-DCRYPTOPP_DISABLE_ASM) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe") -+ if (NOT CRYPTOPP_FOUND) -+ add_definitions(-DCRYPTOPP_DISABLE_ASM) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe") - -- if (APPLE) -- if (DARWIN_VERSION GREATER 10) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare") -+ if (APPLE) -+ if (DARWIN_VERSION GREATER 10) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare") -+ endif() -+ else() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") - endif() -- else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") - endif() - endif() - --add_library(cryptopp STATIC ${cpp_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 +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 ++++ b/src/lib/io/CCryptoMode.h 2013-10-18 17:48:48.300057303 -0600 @@ -17,9 +17,9 @@ #pragma once @@ -122,10 +45,9 @@ Index: synergy-1.4.12/src/lib/synergy/CCryptoMode.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 +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" @@ -137,11 +59,10 @@ Index: synergy-1.4.12/src/lib/synergy/CCryptoStream.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 @@ +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 @@ -150,3 +71,44 @@ Index: synergy-1.4.12/tools/build/toolchain.py 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 . + +-set(cryptopp_dir cryptopp562) ++set(cryptopp_dir cryptopp) + + # only compile the crypto++ files we need. + set(cryptopp_src +@@ -72,16 +72,20 @@ + endif() + + if (UNIX) +- add_definitions(-DCRYPTOPP_DISABLE_ASM) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe") ++ if (NOT CRYPTOPP_FOUND) ++ add_definitions(-DCRYPTOPP_DISABLE_ASM) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe") + +- if (APPLE) +- if (DARWIN_VERSION GREATER 10) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare") ++ if (APPLE) ++ if (DARWIN_VERSION GREATER 10) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare") ++ endif() ++ else() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + endif() +- else() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + endif() + endif() + +-add_library(cryptopp STATIC ${cryptopp_src}) ++if (NOT CRYPTOPP_FOUND) ++ add_library(cryptopp STATIC ${cpp_src}) ++endif() diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index d2f6987e9..22b611117 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -7,9 +7,9 @@ pkgbase=linux-kirkwood pkgname=('linux-kirkwood' 'linux-headers-kirkwood') #pkgname=linux-test # Build kernel with a different name _kernelname=${pkgname#linux} -_basekernel=3.11.5 +_basekernel=3.11.6 pkgver=${_basekernel} -pkgrel=2 +pkgrel=1 cryptover=1.6 bfqver=v6r2 uksmver="0.1.2.2" @@ -32,7 +32,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch") -md5sums=('05ae2366c942d116a821fd4c7e6ffa75' +md5sums=('7e92ca268b71c35a00ebcca884300a83' '00837ef51c35627274d6d07bf8c43b4e' 'e59583f2dcf84b6570681ea69e35de10' 'SKIP' diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index 9379c4d09..8e7a5617d 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -11,9 +11,7 @@ # ALARM: Kevin Mihelich # - removed NaCl, not for ARM # - adjusted gyp flags for v7h -# - use system ffmpeg, added ffmpeg to depends # - patch to fix webrtc code for non-android ARM -# - patch to fix using system ffmpeg # - patch (hack) to fix skia # # moonman @@ -24,7 +22,7 @@ highmem=1 pkgname=chromium pkgver=30.0.1599.101 -pkgrel=1 +pkgrel=1.1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('armv6h' 'armv7h') url="http://www.chromium.org/" @@ -32,7 +30,7 @@ license=('BSD') depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu' 'libgcrypt' 'ttf-font' 'udev' 'dbus' 'flac' 'opus' 'libwebp' 'snappy' 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'harfbuzz-icu' - 'desktop-file-utils' 'hicolor-icon-theme' 'ffmpeg') + 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils' 'subversion') optdepends=('kdebase-kdialog: needed for file dialogs in KDE') @@ -47,16 +45,16 @@ source=(https://gsdview.appspot.com/chromium-browser-official/$pkgname-$pkgver.t chromium.sh chromium-system-icu-r0.patch arm-webrtc-fix.patch - chromium-system-ffmpeg-r7.patch - skia.patch) + skia.patch + v6-ffmpeg.patch) sha256sums=('d9596f28c6922bb5c8d03215ece1a7c51421a2e6f882213eb997f98bd34ca42d' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' '9bf164094ff33565f79807ab17cbd1d3f75655383fdaa01bb1a702263174cf09' '222ec0db5d40b02e4ebbde8a1f1c5de3f0579e51836be87be138c44f8487d0ce' - '4093f87f16f8dc4dd846a88d5b6faf91bed2542308c6a11fef93400c94dbf192' - '77668a94924c6bce6c48ca78c5cb778c6728bb687b66334b7164d7301a267939') + '77668a94924c6bce6c48ca78c5cb778c6728bb687b66334b7164d7301a267939' + '3fbabcbd512494b529e0a0e17560735887acf2291a74653750f9b29f5d45774d') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -73,8 +71,8 @@ prepare() { # Fix WebRTC for ARM patch -Np2 -i "$srcdir/arm-webrtc-fix.patch" - # Fix using system ffmpeg - patch -Np1 -i "$srcdir/chromium-system-ffmpeg-r7.patch" + # Fix ffmpeg build for armv6 + [ "$CARCH" == "armv6h" ] && patch -Np1 -i "$srcdir/v6-ffmpeg.patch" # Temp fix for skia patch -Np0 -i "$srcdir/skia.patch" @@ -138,7 +136,7 @@ fi -Dproprietary_codecs=1 -Duse_system_bzip2=1 -Duse_system_flac=1 - -Duse_system_ffmpeg=1 + -Duse_system_ffmpeg=0 -Duse_system_harfbuzz=1 -Duse_system_icu=1 -Duse_system_libevent=1 @@ -179,7 +177,7 @@ package() { install -Dm4755 -o root -g root out/Release/chrome_sandbox \ "$pkgdir/usr/lib/chromium/chrome-sandbox" - cp out/Release/*.pak \ + cp out/Release/{*.pak,libffmpegsumo.so} \ "$pkgdir/usr/lib/chromium/" # Allow users to override command-line options diff --git a/extra/chromium/chromium-system-ffmpeg-r7.patch b/extra/chromium/chromium-system-ffmpeg-r7.patch deleted file mode 100644 index f3c2b96d1..000000000 --- a/extra/chromium/chromium-system-ffmpeg-r7.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- a/media/filters/ffmpeg_glue.h -+++ b/media/filters/ffmpeg_glue.h -@@ -28,9 +28,9 @@ - #include "base/basictypes.h" - #include "base/memory/scoped_ptr.h" - #include "media/base/media_export.h" -+#include "media/ffmpeg/ffmpeg_common.h" - - struct AVFormatContext; --struct AVIOContext; - - namespace media { - ---- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000 -+++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000 -@@ -85,8 +85,10 @@ - return kCodecGSM_MS; - case AV_CODEC_ID_PCM_MULAW: - return kCodecPCM_MULAW; -+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS - case AV_CODEC_ID_OPUS: - return kCodecOpus; -+#endif - default: - DVLOG(1) << "Unknown audio CodecID: " << codec_id; - } -@@ -130,8 +132,10 @@ - return AV_CODEC_ID_GSM_MS; - case kCodecPCM_MULAW: - return AV_CODEC_ID_PCM_MULAW; -+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS - case kCodecOpus: - return AV_CODEC_ID_OPUS; -+#endif - default: - DVLOG(1) << "Unknown AudioCodec: " << audio_codec; - } -@@ -149,8 +153,10 @@ - return kCodecMPEG4; - case AV_CODEC_ID_VP8: - return kCodecVP8; -+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9 - case AV_CODEC_ID_VP9: - return kCodecVP9; -+#endif - default: - DVLOG(1) << "Unknown video CodecID: " << codec_id; - } -@@ -167,8 +173,10 @@ - return AV_CODEC_ID_MPEG4; - case kCodecVP8: - return AV_CODEC_ID_VP8; -+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9 - case kCodecVP9: - return AV_CODEC_ID_VP9; -+#endif - default: - DVLOG(1) << "Unknown VideoCodec: " << video_codec; - } ---- a/media/filters/ffmpeg_demuxer.cc.orig 2013-05-09 18:04:25.089276403 +0000 -+++ b/media/filters/ffmpeg_demuxer.cc 2013-05-09 18:05:16.289599070 +0000 -@@ -111,12 +111,15 @@ - // Get side data if any. For now, the only type of side_data is VP8 Alpha. We - // keep this generic so that other side_data types in the future can be - // handled the same way as well. -- av_packet_split_side_data(packet.get()); - int side_data_size = 0; -- uint8* side_data = av_packet_get_side_data( -+ uint8* side_data = NULL; -+#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL -+ av_packet_split_side_data(packet.get()); -+ side_data = av_packet_get_side_data( - packet.get(), - AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, - &side_data_size); -+#endif - - // If a packet is returned by FFmpeg's av_parser_parse2() the packet will - // reference inner memory of FFmpeg. As such we should transfer the packet ---- a/media/base/media_posix.cc.orig 2013-05-24 20:59:12.963046035 +0000 -+++ b/media/base/media_posix.cc 2013-05-24 20:59:50.593275882 +0000 -@@ -11,12 +11,15 @@ - #include "base/path_service.h" - #include "base/strings/stringize_macros.h" - #include "media/ffmpeg/ffmpeg_common.h" -+ -+#if !defined(USE_SYSTEM_FFMPEG) - #include "third_party/ffmpeg/ffmpeg_stubs.h" - - using third_party_ffmpeg::kNumStubModules; - using third_party_ffmpeg::kModuleFfmpegsumo; - using third_party_ffmpeg::InitializeStubs; - using third_party_ffmpeg::StubPathMap; -+#endif - - namespace media { - namespace internal { -@@ -46,6 +49,9 @@ - #endif - - bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) { -+#if defined(USE_SYSTEM_FFMPEG) -+ return true; -+#else - StubPathMap paths; - - // First try to initialize with Chrome's sumo library. -@@ -61,6 +67,7 @@ - FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value()); - - return InitializeStubs(paths); -+#endif - } - - } // namespace internal diff --git a/extra/chromium/v6-ffmpeg.patch b/extra/chromium/v6-ffmpeg.patch new file mode 100644 index 000000000..205947cb9 --- /dev/null +++ b/extra/chromium/v6-ffmpeg.patch @@ -0,0 +1,42 @@ +--- ./third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh.orig 2013-10-18 18:18:28.032701497 -0600 ++++ ./third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh 2013-10-18 18:37:10.817807244 -0600 +@@ -310,13 +310,12 @@ + # much smaller than optimized arm builds, hence we go with the global + # CrOS settings. + add_flag_common --enable-armv6 +- add_flag_common --enable-armv6t2 ++ add_flag_common --disable-armv6t2 + add_flag_common --enable-vfp +- add_flag_common --enable-thumb ++ add_flag_common --disable-thumb + add_flag_common --disable-neon +- add_flag_common --extra-cflags=-march=armv7-a +- add_flag_common --extra-cflags=-mtune=cortex-a8 +- add_flag_common --extra-cflags=-mfpu=vfpv3-d16 ++ add_flag_common --extra-cflags=-march=armv6 ++ add_flag_common --extra-cflags=-mfpu=vfp + # NOTE: softfp/hardfp selected at gyp time. + add_flag_common --extra-cflags=-mfloat-abi=hard + elif [ "$TARGET_ARCH" = "arm-neon" ]; then +--- ./third_party/ffmpeg/ffmpeg.gyp.orig 2013-10-18 18:07:27.025272782 -0600 ++++ ./third_party/ffmpeg/ffmpeg.gyp 2013-10-18 18:38:58.462388238 -0600 +@@ -234,9 +234,7 @@ + '-marm', + ], + 'cflags': [ +- '-mthumb', +- '-march=armv7-a', +- '-mtune=cortex-a8', ++ '-march=armv6', + ], + # On arm we use gcc to compile the assembly. + 'sources': [ +@@ -245,7 +243,7 @@ + 'conditions': [ + ['arm_neon == 0', { + 'cflags': [ +- '-mfpu=vfpv3-d16', ++ '-mfpu=vfp', + ], + }, { + 'cflags': [ diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 472592222..969fc9c88 100644 --- a/extra/qt4/PKGBUILD +++ b/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'