From 6186582583ec0329ab93bace8731cdb3b6f0dac8 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 8 Apr 2013 00:05:45 -0700 Subject: Mon Apr 8 00:05:45 PDT 2013 --- community/glfw/PKGBUILD | 6 ++-- community/libnfs/PKGBUILD | 12 +++---- community/midori/PKGBUILD | 17 +++------- community/midori/fix-copying.patch | 63 ------------------------------------ community/perl-gnome2-wnck/PKGBUILD | 9 +++--- extra/harfbuzz/PKGBUILD | 6 ++-- extra/pigeonhole/PKGBUILD | 10 +++--- extra/wireshark/PKGBUILD | 11 +++---- libre/kdebase-runtime-libre/PKGBUILD | 4 +-- libre/linux-libre/PKGBUILD | 14 ++++---- libre/linux-libre/config.i686 | 2 +- libre/linux-libre/config.x86_64 | 2 +- pcr/aqsis/PKGBUILD | 4 +-- 13 files changed, 43 insertions(+), 117 deletions(-) delete mode 100644 community/midori/fix-copying.patch diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index de84ce1e3..e017a51c6 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79769 2012-11-12 09:00:25Z svenstaro $ +# $Id: PKGBUILD 87832 2013-04-07 21:39:10Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: philefou # Contributor: lindquist @@ -7,7 +7,7 @@ # Contributor: SpepS pkgname=glfw -pkgver=2.7.7 +pkgver=2.7.8 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu') makedepends=('mesa') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('873a721fc415268e2b794d4dd08c558f') +md5sums=('a2e1b13e46a7c637a7760c94b72896cd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD index eaef7ac71..44acdab1b 100644 --- a/community/libnfs/PKGBUILD +++ b/community/libnfs/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 68570 2012-03-28 10:32:51Z idevolder $ +# $Id: PKGBUILD 87823 2013-04-07 09:29:35Z idevolder $ # Maintainer: BlackIkeEagle pkgname=libnfs -pkgver=1.3.0 +pkgver=1.5.0 pkgrel=1 pkgdesc="client library for accessing NFS shares" arch=('i686' 'x86_64') url="https://github.com/sahlberg/libnfs" license=('GPL') depends=('glibc') -source=("$pkgname-$pkgver.tar.gz::https://github.com/sahlberg/libnfs/tarball/$pkgname-$pkgver") -_srcfolder=sahlberg-libnfs-47e5a2c -sha256sums=('0acda3029db699c3978684080843f71d222ad35b30a2ff0d220d144e98854948') +source=("https://github.com/downloads/sahlberg/$pkgname/$pkgname-$pkgver.tar.gz") +#_srcfolder=sahlberg-libnfs-47e5a2c +sha256sums=('5663355dc18e75c893e09b133ca3ef70cf00754acfea863257f509922b5e5faa') options=(!libtool) build() { - mv "$_srcfolder" "$pkgname-$pkgver" + #mv "$_srcfolder" "$pkgname-$pkgver" cd "$pkgname-$pkgver" diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 7815bc180..c420ccd88 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85855 2013-03-07 19:55:29Z bpiotrowski $ +# $Id: PKGBUILD 87825 2013-04-07 13:05:16Z arodseth $ # Maintainer: Alexander Rødseth # Maintainer: Bartłomiej Piotrowski # Contributor: Andreas Radke @@ -7,7 +7,7 @@ # Contributor: Bartłomiej Piotrowski pkgname=midori -pkgver=0.4.9 +pkgver=0.5.0 pkgrel=1 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686') @@ -19,21 +19,12 @@ makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' 'aria2: download utility') options=('!emptydirs') -source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" - 'fix-copying.patch') -sha256sums=('f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11' - 'd4395ac994d8d614f93ae4863bbf6289b1980e0ed84aef52ca95a678b464b959') +source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") +sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0') build() { cd $srcdir/$pkgname-$pkgver - # FS#32229 - patch -s -Np1 -i ../fix-copying.patch > /dev/null || true - - # Python 2 - export PYTHON=/usr/bin/python2 - sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf - ./configure --prefix=/usr \ --jobs=${MAKEFLAGS/-j/} \ --enable-addons \ diff --git a/community/midori/fix-copying.patch b/community/midori/fix-copying.patch deleted file mode 100644 index ab3581900..000000000 --- a/community/midori/fix-copying.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/midori/midori-browser.c b/midori/midori-browser.c -index 28aca95..b33e2e4 100644 ---- a/midori/midori-browser.c -+++ b/midori/midori-browser.c -@@ -1041,7 +1041,7 @@ midori_browser_save_uri (MidoriBrowser* browser, - GtkWidget* dialog; - const gchar* title = midori_view_get_display_title (view); - gchar* filename; -- GList* resources = midori_view_get_subresources (view); -+ GList* resources = midori_view_get_resources (view); - gboolean file_only = TRUE; - GtkWidget* checkbox = NULL; - -diff --git a/midori/midori-view.c b/midori/midori-view.c -index 37cc78f..2c71f55 100644 ---- a/midori/midori-view.c -+++ b/midori/midori-view.c -@@ -1993,21 +1993,22 @@ midori_web_view_menu_image_new_tab_activate_cb (GtkWidget* widget, - } - - GList* --midori_view_get_subresources (MidoriView* view) -+midori_view_get_resources (MidoriView* view) - { - WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view); - WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view); - WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame); -- return webkit_web_data_source_get_subresources (data_source); -+ GList* resources = webkit_web_data_source_get_subresources (data_source); -+ return g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source)); - } - - static GString* - midori_view_get_data_for_uri (MidoriView* view, - const gchar* uri) - { -- GList* resources = midori_view_get_subresources (view); -+ GList* resources = midori_view_get_resources (view); - GList* list; -- GString* result; -+ GString* result = NULL; - - for (list = resources; list; list = g_list_next (list)) - { -@@ -2032,7 +2033,8 @@ midori_view_clipboard_get_image_cb (GtkClipboard* clipboard, - MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, "view")); - WebKitHitTestResult* hit_test = user_data; - gchar* uri = katze_object_get_string (hit_test, "image-uri"); -- /* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */ -+ -+ if (gtk_targets_include_image(&selection_data->target, 1, TRUE)) - { - GString* data = midori_view_get_data_for_uri (view, uri); - if (data != NULL) -@@ -2052,7 +2054,7 @@ midori_view_clipboard_get_image_cb (GtkClipboard* clipboard, - else - g_warn_if_reached (); - } -- /* if (gtk_selection_data_targets_include_text (selection_data)) */ -+ if (gtk_targets_include_text(&selection_data->target, 1)) - gtk_selection_data_set_text (selection_data, uri, -1); - g_free (uri); - } diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD index 32e0812be..368617485 100644 --- a/community/perl-gnome2-wnck/PKGBUILD +++ b/community/perl-gnome2-wnck/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 71783 2012-06-02 10:30:34Z bluewind $ +# $Id: PKGBUILD 87815 2013-04-07 02:33:26Z bgyorgy $ # Maintainer Sergej Pupykin # Contributor: Alessio 'mOLOk' Bolognino pkgname=perl-gnome2-wnck pkgver=0.16 -pkgrel=6 +pkgrel=7 pkgdesc="Perl interface to the Window Navigator Construction Kit" arch=('i686' 'x86_64') license=("GPL" "PerlArtistic") url="http://search.cpan.org/dist/Gnome2-Wnck" -depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck') +depends=('gtk2-perl' 'libwnck') +makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz") md5sums=('439f4569ffd7af96ef1d3feaab23760e') @@ -23,6 +24,4 @@ build() { package() { cd Gnome2-Wnck-${pkgver} make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete } diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 5bb0db2e0..f5f608208 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180804 2013-03-26 11:49:33Z foutrelis $ +# $Id: PKGBUILD 182119 2013-04-07 20:49:30Z heftig $ # Maintainer: Jan de Groot pkgname=harfbuzz -pkgver=0.9.14 +pkgver=0.9.15 pkgrel=1 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d07c0ffdbbbfdfbb6c65e73fe9c76466e87dbf04b094cbd0abf5fd7d571a4004') +sha256sums=('214f919c2c998eb1316dd1a14a13adf27460e706a709488777076babf7fbbf1d') build() { cd ${pkgname}-${pkgver} diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index d9c4287e8..e9f62a15d 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182045 2013-04-05 19:28:13Z andyrtr $ +# $Id: PKGBUILD 182109 2013-04-07 09:14:17Z andyrtr $ # Maintainer: Andreas Radke # Contributorr: Peter Lewis @@ -11,8 +11,8 @@ _dcpkgver=2.1.16 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.3.3 -pkgrel=7 +pkgver=0.3.4 +pkgrel=1 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" @@ -22,8 +22,8 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e' - '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec' +sha256sums=('34da8801c7695c397a53a13574fe8674b92aa9d936f91a1b6e6df787488a6d05' + 'SKIP' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') build() { diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index dc31b1283..23a305116 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 179713 2013-03-09 12:31:30Z guillaume $ +# $Id: PKGBUILD 182116 2013-04-07 20:47:05Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Florian Pritz pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark pkgver=1.8.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua51' 'python' 'portaudio') + 'libgcrypt' 'lua51' 'python') url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 @@ -30,14 +30,13 @@ build() { --prefix=/usr \ --with-ssl \ --with-zlib=yes \ - --with-lua \ - --with-portaudio + --with-lua make all } package_wireshark-cli() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'portaudio' 'lua51') + depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') install=wireshark.install conflicts=(wireshark) diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index a0d4c8603..441852591 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -6,12 +6,12 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre pkgver=4.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' license=('GPL' 'LGPL') -depends=('kactivities' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' +depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth') makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' 'networkmanager') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 4ae75f749..e340623ac 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ +# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=5 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '0439191aaca9f09786f7ab70a080a8f9' - 'f33ffeda1f61705bc568036656cc462f' - '437924c863dae99e6283713c130ac71e' + '1b3cd03d2add3bfe74e98a953f28c8d0' + '9b425f069f920cdd6798b3adab79d3af' + '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'a245684c46c8bc2348ebb259c18e40a6') + '5629a56818c1875bcc77a51c69347d98') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 4167d805b..f6c197448 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -5537,7 +5537,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 3b4ba29d2..e032b072a 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -5308,7 +5308,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD index 706a0c042..89998fc84 100644 --- a/pcr/aqsis/PKGBUILD +++ b/pcr/aqsis/PKGBUILD @@ -4,7 +4,7 @@ pkgname=aqsis pkgver=1.8.2 -pkgrel=2 +pkgrel=3 pkgdesc='A high quality, photorealistic, 3D rendering solution' arch=( i686 @@ -18,7 +18,7 @@ optdepends=( 'mesa-libgl: ptview' ) depends=( - boost-libs + 'boost-libs=1.53.0' desktop-file-utils hicolor-icon-theme openexr -- cgit v1.2.3-54-g00ecf