From 3f0c4efbf72adbd091565fcc39ad1d09c92be5d0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Dec 2012 02:18:52 -0800 Subject: Thu Dec 6 02:15:36 PST 2012 --- extra/dnsmasq/PKGBUILD | 12 ++--- extra/dnsmasq/dnsmasq.service | 2 + extra/enlightenment17/PKGBUILD | 8 +-- extra/hugin/PKGBUILD | 51 +++++++++---------- extra/hugin/install | 13 +++++ extra/thunar/PKGBUILD | 17 ++++--- ...ar-1.6.0-show-nodisplay-true-applications.patch | 57 ++++++++++++++++++++++ 7 files changed, 116 insertions(+), 44 deletions(-) create mode 100644 extra/hugin/install create mode 100644 extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch (limited to 'extra') diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index ad155e96e..f701c66c9 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165413 2012-08-18 13:27:49Z dreisner $ +# $Id: PKGBUILD 172766 2012-12-05 11:05:17Z dreisner $ # Maintainer: Dave Reisner # Contributor: Paul Mattal # Contributor: Tom Newsom pkgname=dnsmasq -pkgver=2.63 +pkgver=2.64 pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" @@ -18,19 +18,17 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('43e771997615ebcd8f6c6ffa60c3e40b' +md5sums=('60adb8e01960a41ce67e0422c4cf9ab3' '66479e99123faeab83ebaed709ef95b5' '819fbdf6440d710616e6df5f8ca9cdba' - '631d8349acbed1b01d4e11d9f42fdb7d') + '7ac45726cabef4145db40d758cc7fedf') build() { cd "$pkgname-$pkgver" # link against dbus. this ugliness is needed to ensure that the # compile time opts report properly on startup. yuck. - sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ { - i#define HAVE_DBUS - }' src/config.h + sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h make } diff --git a/extra/dnsmasq/dnsmasq.service b/extra/dnsmasq/dnsmasq.service index 05a1f0b69..a0525b9c2 100644 --- a/extra/dnsmasq/dnsmasq.service +++ b/extra/dnsmasq/dnsmasq.service @@ -1,5 +1,7 @@ [Unit] Description=A lightweight DHCP and caching DNS server +After=network.target +Documentation=man:dnsmasq(8) [Service] Type=dbus diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 843a6af5b..5e8651abe 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172451 2012-12-02 20:54:27Z ronald $ +# $Id: PKGBUILD 172777 2012-12-05 18:43:12Z ronald $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0alpha7 -_pkgver=0.17.0-alpha7 +pkgver=0.17.0alpha8 +_pkgver=0.17.0-alpha8 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('97ed2c936e6fa2385658f876a4099a029df43787' +sha1sums=('12612175f08d11ff34c0c509f4e28e412cc13510' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index c6c81350d..3c34d8e9a 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,39 +1,36 @@ -# $Id: PKGBUILD 169748 2012-10-27 23:41:52Z eric $ -# Maintainer: Tobias Kieslich +# $Id: PKGBUILD 172786 2012-12-06 00:11:28Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Tobias Kieslich # Contributor: Giovanni Scafora # Contributor: Dominik Ryba pkgname=hugin -pkgver=2011.4.0 -pkgrel=7 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" +pkgver=2012.0.0 +pkgrel=1 +pkgdesc='Panorama photo stitcher' +url='http://hugin.sourceforge.net/' license=('GPL') +arch=('i686' 'x86_64') depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' - 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') -makedepends=('zip' 'cmake' 'boost' 'tclap' 'mesa') -install=hugin.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - gcc47.patch) -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' - 'aa0fc9425bd7a4b5e270412f4ca72258fac77298') + 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils') +makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python' 'swig') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d') + +install=install build() { - cd "${srcdir}" - patch -Np0 -i gcc47.patch - mkdir build - cd build - export CXXFLAGS+=" -fpermissive" - cmake "${srcdir}/${pkgname}-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ - -DENABLE_LAPACK=yes - make + cd "${srcdir}/${pkgname}-${pkgver}" + export CXXFLAGS+=" -fpermissive" + cmake . \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + make } package(){ - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/hugin/install b/extra/hugin/install new file mode 100644 index 000000000..f959d50f6 --- /dev/null +++ b/extra/hugin/install @@ -0,0 +1,13 @@ +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index f1a9e1fcf..6d8ef4bed 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 172467 2012-12-03 11:50:24Z foutrelis $ +# $Id: PKGBUILD 172779 2012-12-05 19:01:30Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Andrew Simmons pkgname=thunar pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64') url="http://thunar.xfce.org" license=('GPL2' 'LGPL2.1') groups=('xfce4') -depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev' - 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') +depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' + 'systemd' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') makedepends=('intltool' 'gtk-doc' 'xfce4-panel') optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' 'polkit-gnome: for mounting internal partitions (needs root password)' @@ -22,12 +22,17 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems 'thunar-media-tags-plugin: view/edit id3/ogg tags') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2) -sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a') +source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2 + thunar-1.6.0-show-nodisplay-true-applications.patch) +sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a' + 'f7377aad1eb60420d0c1c878c3916913934f994df810f3a60d580fc2be3b80c0') build() { cd "$srcdir/Thunar-$pkgver" + # https://bugzilla.xfce.org/show_bug.cgi?id=9595 + patch -Np1 -i "$srcdir/thunar-1.6.0-show-nodisplay-true-applications.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch new file mode 100644 index 000000000..d054180b5 --- /dev/null +++ b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch @@ -0,0 +1,57 @@ +From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001 +From: Nick Schermer +Date: Wed, 05 Dec 2012 17:34:38 +0000 +Subject: Show NoDisplay=true applications (bug #9595). + +See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html +--- +diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c +index f7ae355..f2993b8 100644 +--- a/thunar/thunar-chooser-button.c ++++ b/thunar/thunar-chooser-button.c +@@ -453,7 +453,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button, + /* add all possible applications */ + for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i) + { +- /* skip infos that have NoDisplay or OnlyShowIn set */ + if (thunar_g_app_info_should_show (lp->data)) + { + /* insert the item into the store */ +diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c +index d77f72a..1b9026a 100644 +--- a/thunar/thunar-gio-extensions.c ++++ b/thunar/thunar-gio-extensions.c +@@ -569,26 +569,17 @@ gboolean + thunar_g_app_info_should_show (GAppInfo *info) + { + #ifdef HAVE_GIO_UNIX +- const gchar *filename; +- + _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE); + +- /* check if NoDesktop is set or OnlyShowIn is set but +- * does not contain XFCE */ +- if (g_app_info_should_show (info)) +- return TRUE; +- + if (G_IS_DESKTOP_APP_INFO (info)) + { +- /* show custom command from the user directory, this to not +- * exclude custom commands */ +- filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); +- if (filename != NULL +- && g_str_has_prefix (filename, g_get_user_data_dir ())) +- return TRUE; ++ /* NoDisplay=true files should be visible in the interface, ++ * because this key is intent to hide mime-helpers from the ++ * application menu. Hidden=true is never returned by GIO. */ ++ return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL); + } + +- return FALSE; ++ return TRUE; + #else + /* we cannot exclude custom actions, so show everything */ + return TRUE; +-- +cgit v0.9.0.3 -- cgit v1.2.3-54-g00ecf