summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/alsa-tools/PKGBUILD6
-rw-r--r--extra/ffmpeg/PKGBUILD8
-rw-r--r--extra/folks/PKGBUILD10
-rw-r--r--extra/harfbuzz/PKGBUILD6
-rw-r--r--extra/inkscape/PKGBUILD25
-rw-r--r--extra/inkscape/freetype.patch15
-rw-r--r--extra/inkscape/gc74.patch54
-rw-r--r--extra/inkscape/poppler-0.26.patch89
-rw-r--r--extra/inkscape/spuriouscomma.patch11
-rw-r--r--extra/kdebase-workspace/KDEBUG-336589.patch26
-rw-r--r--extra/kdebase-workspace/PKGBUILD13
-rw-r--r--extra/opencv/PKGBUILD29
-rw-r--r--extra/pango/PKGBUILD8
-rw-r--r--extra/sg3_utils/PKGBUILD6
14 files changed, 78 insertions, 228 deletions
diff --git a/extra/alsa-tools/PKGBUILD b/extra/alsa-tools/PKGBUILD
index 99bb2feb4..b166c92b1 100644
--- a/extra/alsa-tools/PKGBUILD
+++ b/extra/alsa-tools/PKGBUILD
@@ -4,8 +4,8 @@
# Contributor: Jochen Immendœrfer <jochen.immendoerfer@gmail.com>
pkgname=alsa-tools
-pkgver=1.0.27
-pkgrel=5
+pkgver=1.0.28
+pkgrel=1
pkgdesc="Advanced tools for certain sound cards"
arch=('i686' 'x86_64')
url="http://alsa-project.org/"
@@ -18,7 +18,7 @@ optdepends=('fltk: hdspconf, hdspmixer'
'bash: couple of tools')
provides=("$pkgname-emu10k1" "$pkgname-ice1712")
source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2")
-md5sums=('1ea381d00a6069a98613aa7effa4cb51')
+md5sums=('e6c929175d8ee729c06d49b51439bad6')
_tools=("as10k1" "echomixer" "envy24control" "hdajackretask" "hda-verb"
"hdspconf" "hdsploader" "hdspmixer" "ld10k1" "mixartloader"
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index e19b81d66..81d4af7ae 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 214743 2014-06-09 08:04:40Z bpiotrowski $
+# $Id: PKGBUILD 215411 2014-06-24 06:53:36Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=2.2.3
-pkgrel=2
+pkgver=2.2.4
+pkgrel=1
epoch=1
pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ depends=(
)
makedepends=('libvdpau' 'yasm' 'x264')
source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('dbb5b6b69bd010916f17df0ae596e0b1'
+md5sums=('5b85aea53d8dcd5b0f7b497f233bc101'
'SKIP')
build() {
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index dfbd37a36..32edbfe2c 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 215389 2014-06-23 19:53:29Z heftig $
+# $Id: PKGBUILD 215426 2014-06-24 19:21:02Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=folks
-pkgver=0.9.7
-pkgrel=2
+pkgver=0.9.7.1
+pkgrel=1
pkgdesc="Library to aggregates people into metacontacts"
arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/Folks"
+url="https://wiki.gnome.org/Projects/Folks"
license=(LGPL2.1)
depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist)
makedepends=(gobject-introspection intltool vala)
install=folks.install
options=('!emptydirs')
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-${pkgver}.tar.xz)
-md5sums=('aeaeb5a8e7277b167b9f055f372b9d5d')
+md5sums=('18f3e0799fdea55be7e27bc16e73bd8a')
build() {
cd $pkgname-$pkgver
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index a230ff71d..18342a9bf 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213528 2014-05-24 00:33:42Z heftig $
+# $Id: PKGBUILD 215423 2014-06-24 19:18:03Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=(harfbuzz)
pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.28
+pkgver=0.9.29
pkgrel=1
pkgdesc="OpenType text shaping engine"
arch=(i686 x86_64)
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
license=(MIT)
makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('a567f7c58018af0a9751e18641fd8434bfcef8307122dabe47dd652ce8bde048')
+sha256sums=('601cea38c6fa0cf362dd9042c66cf4db711c5f9390de4ca46d6d2fc3f64de390')
build() {
cd $pkgbase-$pkgver
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 58f933952..837c2fbaa 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215353 2014-06-23 10:40:14Z bisson $
+# $Id: PKGBUILD 215399 2014-06-23 22:12:53Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Kieslich <tobias@justdreams.de>
# Contributor: tobias <tobias@archlinux.org>
pkgname=inkscape
-pkgver=0.48.4
-pkgrel=17
+pkgver=0.48.5
+pkgrel=1
pkgdesc='Vector graphics editor using the SVG file format'
url='http://inkscape.sourceforge.net/'
license=('GPL' 'LGPL')
@@ -19,33 +19,20 @@ optdepends=('pstoedit: latex formulas'
'python2-lxml: some extensions and filters'
'uniconvertor: reading/writing to some proprietary formats')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
- 'spuriouscomma.patch'
- 'ime-placement.patch'
- 'freetype.patch'
- 'gc74.patch'
- 'poppler-0.26.patch')
-sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
- '7d1d5a6d1d2b0926721a994d5889c52890fc57c1'
- 'b12b948ca5ee7e02703a13aa8b8bccdf67947f12'
- 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf'
- '3e1b5b6852d668388a857bc7a73fb7731fb262b8'
- 'b60843f43e6d3b6cfcf4e253abb3f7ea7bc69c2a')
+ 'ime-placement.patch')
+sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8'
+ 'b12b948ca5ee7e02703a13aa8b8bccdf67947f12')
install=install
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../gc74.patch # FS#39106
- patch -p0 -i ../freetype.patch # FS#37956
patch -p1 -i ../ime-placement.patch # FS#39898
- patch -p0 -i ../spuriouscomma.patch
- patch -p0 -i ../poppler-0.26.patch
sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
sed -i 's|"python"|"python2"|g' src/main.cpp
- sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp}
sed -i '/extern unsigned GC_version;/c unsigned GC_version=GC_VERSION_MAJOR<<16+GC_VERSION_MINOR<<8+GC_VERSION_MICRO;' configure
}
diff --git a/extra/inkscape/freetype.patch b/extra/inkscape/freetype.patch
deleted file mode 100644
index 84cdc1ca6..000000000
--- a/extra/inkscape/freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-=== modified file 'src/libnrtype/FontFactory.h'
---- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000
-+++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000
-@@ -31,7 +31,8 @@
- #include <pango/pangowin32.h>
- #else
- #include <pango/pangoft2.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #endif
-
- namespace Glib
-
-
diff --git a/extra/inkscape/gc74.patch b/extra/inkscape/gc74.patch
deleted file mode 100644
index 41615ac49..000000000
--- a/extra/inkscape/gc74.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- inkscape-0.48.4/src/gc-core.h.old 2013-12-31 01:22:38.976653890 +0400
-+++ inkscape-0.48.4/src/gc-core.h 2013-12-31 01:22:48.525653608 +0400
-@@ -57,7 +57,7 @@
- CleanupFunc *old_func,
- void **old_data);
- int (*general_register_disappearing_link)(void **p_ptr,
-- void *base);
-+ const void *base);
- int (*unregister_disappearing_link)(void **p_ptr);
- std::size_t (*get_heap_size)();
- std::size_t (*get_free_bytes)();
---- inkscape-0.48.4/src/gc.cpp.old 2013-12-31 01:23:50.462651778 +0400
-+++ inkscape-0.48.4/src/gc.cpp 2013-12-31 01:40:37.718622017 +0400
-@@ -70,8 +70,8 @@
- return base + debug_base_fixup();
- }
-
--int debug_general_register_disappearing_link(void **p_ptr, void *base) {
-- char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
-+int debug_general_register_disappearing_link(void **p_ptr, const void *base) {
-+ char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base)) - debug_base_fixup();
- return GC_general_register_disappearing_link(p_ptr, real_base);
- }
-
-@@ -90,7 +90,7 @@
- }
- }
-
--int dummy_general_register_disappearing_link(void **, void *) { return false; }
-+int dummy_general_register_disappearing_link(void **, const void *) { return false; }
-
- int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
-
-@@ -112,7 +112,11 @@
- &GC_malloc_atomic_uncollectable,
- &GC_base,
- &GC_register_finalizer_ignore_self,
-+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
- &GC_general_register_disappearing_link,
-+#else
-+ (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
-+#endif
- &GC_unregister_disappearing_link,
- &GC_get_heap_size,
- &GC_get_free_bytes,
-@@ -202,7 +206,7 @@
- die_because_not_initialized();
- }
-
--int stub_general_register_disappearing_link(void **, void *) {
-+int stub_general_register_disappearing_link(void **, const void *) {
- die_because_not_initialized();
- return 0;
- }
diff --git a/extra/inkscape/poppler-0.26.patch b/extra/inkscape/poppler-0.26.patch
deleted file mode 100644
index 84b324a5d..000000000
--- a/extra/inkscape/poppler-0.26.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2014-04-28 13:42:17.843140695 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-04-28 14:05:10.646106685 +0000
-@@ -861,7 +861,7 @@
- isolated = knockout = gFalse;
- if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
-+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
- #else
- blendingColorSpace = GfxColorSpace::parse(&obj5);
- #endif
-@@ -1085,9 +1085,9 @@
- res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (obj.isNull()) {
-- colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-- colorSpace = GfxColorSpace::parse(&obj, NULL);
-+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
- }
- #else
- if (obj.isNull()) {
-@@ -1120,9 +1120,9 @@
- res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (obj.isNull()) {
-- colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-- colorSpace = GfxColorSpace::parse(&obj, NULL);
-+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
- }
- #else
- if (obj.isNull()) {
-@@ -1213,7 +1213,7 @@
- }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (args[numArgs-1].isName() &&
-- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
- state->setFillPattern(pattern);
- builder->updateStyle(state);
- }
-@@ -1273,7 +1273,7 @@
- }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (args[numArgs-1].isName() &&
-- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
- state->setStrokePattern(pattern);
- builder->updateStyle(state);
- }
-@@ -1711,7 +1711,7 @@
- GBool savedState = gFalse;
-
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-- if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-+ if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
- return;
- }
- #else
-@@ -2727,7 +2727,7 @@
- }
- if (!obj1.isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-- colorSpace = GfxColorSpace::parse(&obj1, NULL);
-+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #else
- colorSpace = GfxColorSpace::parse(&obj1);
- #endif
-@@ -2816,7 +2816,7 @@
- }
- }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-- maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
-+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #else
- maskColorSpace = GfxColorSpace::parse(&obj1);
- #endif
-@@ -3007,7 +3007,7 @@
- transpGroup = gTrue;
- if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
-+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
- #else
- blendingColorSpace = GfxColorSpace::parse(&obj3);
- #endif
diff --git a/extra/inkscape/spuriouscomma.patch b/extra/inkscape/spuriouscomma.patch
deleted file mode 100644
index bc538068f..000000000
--- a/extra/inkscape/spuriouscomma.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500
-+++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600
-@@ -239,7 +239,7 @@
- private:
- GtkWidget *tool_toolbox;
- GtkWidget *aux_toolbox;
-- GtkWidget *commands_toolbox,;
-+ GtkWidget *commands_toolbox;
- GtkWidget *snap_toolbox;
-
- static void init(SPDesktopWidget *widget);
diff --git a/extra/kdebase-workspace/KDEBUG-336589.patch b/extra/kdebase-workspace/KDEBUG-336589.patch
new file mode 100644
index 000000000..a38336f3c
--- /dev/null
+++ b/extra/kdebase-workspace/KDEBUG-336589.patch
@@ -0,0 +1,26 @@
+commit e8241313fc979aefafc8c2a0207570d6394f1580
+Author: Martin Gräßlin <mgraesslin@kde.org>
+Date: Mon Jun 23 07:45:44 2014 +0200
+
+ [libkwineffects] Require strict binding for intel driver
+
+ According to driver devs it's a "buggy micro-optimisation", see
+ https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1
+
+ BUG: 336589
+ REVIEW: 118893
+
+diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp
+index 4b2e6f3..9a391a0 100644
+--- a/libkwineffects/kwinglplatform.cpp
++++ b/libkwineffects/kwinglplatform.cpp
+@@ -811,7 +811,8 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
+ m_supportsGLSL = false;
+
+ m_limitedGLSL = m_supportsGLSL && m_chipClass < I965;
+- m_looseBinding = true;
++ // see https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1
++ m_looseBinding = false;
+
+ if (m_chipClass < I915) {
+ m_recommendedCompositor = XRenderCompositing;
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index e8833f109..d60490577 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 214966 2014-06-10 23:03:23Z andrea $
+# $Id: PKGBUILD 215421 2014-06-24 16:59:40Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -6,7 +6,7 @@ pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.11.10
_pkgver=4.13.2
-pkgrel=1
+pkgrel=2
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,7 +29,8 @@ backup=('usr/share/config/kdm/kdmrc')
source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
- 'khotkeys-qt4.patch')
+ 'khotkeys-qt4.patch'
+ 'KDEBUG-336589.patch')
sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -39,7 +40,8 @@ sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd'
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
'd509dac592bd8b310df27991b208c95b6d907514'
- 'aa9d2e5a69986c4c3d47829721ea99edb473be12')
+ 'aa9d2e5a69986c4c3d47829721ea99edb473be12'
+ 'e7a21bd2371ce069627ddbfffb3cf5caddcb1bff')
prepare() {
mkdir build
@@ -55,6 +57,9 @@ prepare() {
# KDEBUG#202629
patch -p0 -i "${srcdir}"/terminate-server.patch
+
+ cd kwin
+ patch -p1 -i "${srcdir}"/KDEBUG-336589.patch
}
build() {
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 9b0ef8867..24eb11287 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 213135 2014-05-19 14:16:07Z svenstaro $
+# $Id: PKGBUILD 215428 2014-06-24 20:06:31Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgbase=opencv
pkgname=('opencv' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.4.8
-pkgrel=2
+pkgver=2.4.9
+pkgrel=1
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64')
license=('BSD')
@@ -21,7 +20,7 @@ optdepends=('opencv-samples'
source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
'pkgconfig.patch'
'fsh.patch')
-md5sums=('50cc1433b3654074206f5b3dbfd49848'
+md5sums=('7f958389e71c77abdf5efe1da988b80c'
'c7cea48ed7d4f729ebdb9673bac41bd3'
'c597598d142dd34d0eb4af7d6e9779d8')
@@ -51,15 +50,16 @@ _cmakeopts=('-D WITH_OPENCL=ON'
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # hack-fix pkg-config mess
+ msg2 "Fixing broken pkg-config (downstream)"
# see https://bugs.archlinux.org/task/32430
# and http://code.opencv.org/issues/1925
patch -Np1 -i "$srcdir/pkgconfig.patch"
- # hack-fix folder naming inconsistency that they won't fix
+ # TODO: this is mostly upstream frei0r; they hardcode the path
+ #msg2 "Hack-fixing folder naming inconsistency (downstream)"
# see http://code.opencv.org/issues/2512
# and https://bugs.archlinux.org/task/32342
- patch -Np1 -i "$srcdir/fsh.patch"
+ #patch -Np1 -i "$srcdir/fsh.patch"
# no longer including docs, see https://bugs.archlinux.org/task/34185
# python2 compatibility for generating (html) docs
@@ -82,16 +82,17 @@ package_opencv() {
make DESTDIR="$pkgdir" install
# install license file
- install -Dm644 "$srcdir/$pkgname-$pkgver/doc/license.txt" \
+ install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
cd "$pkgdir/usr/share"
# separate samples package; also be -R friendly
- if [[ -d $pkgname/samples ]]; then
- mv $pkgname/samples "$srcdir/opencv-samples"
- elif [[ -d $_realname ]]; then
- warn "Directory naming issue; samples package may not be built!"
+ if [[ -d OpenCV/samples ]]; then
+ mv OpenCV/samples "$srcdir/$pkgname-samples"
+ mv OpenCV $pkgname # otherwise folder naming is inconsistent
+ elif [[ ! -d OpenCV ]]; then
+ warning "Directory naming issue; samples package may not be built!"
fi
}
@@ -104,7 +105,7 @@ package_opencv-samples() {
cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
# install license file
- install -Dm644 "$srcdir/opencv-$pkgver/doc/license.txt" \
+ install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 6db69127c..5a6fbe489 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210551 2014-04-14 20:13:38Z jgc $
+# $Id: PKGBUILD 215424 2014-06-24 19:18:52Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=pango
-pkgver=1.36.3
-pkgrel=2
+pkgver=1.36.5
+pkgrel=1
pkgdesc="A library for layout and rendering of text"
arch=('i686' 'x86_64')
license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introsp
install=pango.install
source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
url="http://www.pango.org/"
-sha256sums=('ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22')
+sha256sums=('be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index d1d877db2..29b9b8b04 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 209917 2014-04-08 15:23:45Z anatolik $
+#$Id: PKGBUILD 215417 2014-06-24 15:10:27Z anatolik $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
pkgname=sg3_utils
-pkgver=1.38
+pkgver=1.39
pkgrel=1
pkgdesc="Generic SCSI utilities"
arch=(i686 x86_64)
@@ -10,7 +10,7 @@ url="http://sg.danny.cz/sg/sg3_utils.html"
license=('GPL' 'custom:BSD')
depends=('glibc')
source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ee60a79cd4eb4fa8cebb83c0e9c3707c')
+md5sums=('01d9a5421d778d2707f90461836c3d11')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-10-26 16:29:49 +0000