From c900355ac24fb238dbd0d8f6253a629561f78bee Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Sep 2013 02:33:58 -0700 Subject: Sat Sep 28 02:32:51 PDT 2013 --- community/clanlib/PKGBUILD | 18 +- community/cppcheck/PKGBUILD | 8 +- community/dee/PKGBUILD | 8 +- community/deja-dup/PKGBUILD | 23 ++- community/fatrat/PKGBUILD | 6 +- .../0001-Add-the-GNOME-Flashback-session.patch | 95 ---------- .../gnome-panel/18_fix_force_quit_applet.patch | 98 ---------- community/gnome-panel/PKGBUILD | 50 ++---- .../gnome-panel/drop-gweather-xml-include.patch | 10 -- community/gnome-panel/fix-autoconf.patch | 11 -- community/gnome-panel/gnome-desktop-3.8.patch | 199 --------------------- community/gnome-panel/session.patch | 8 + community/gtkspell3/PKGBUILD | 6 +- community/librcc/PKGBUILD | 19 +- community/librcc/librcc-strnlen.patch | 17 -- community/ruby-iconv/PKGBUILD | 26 ++- community/rust/PKGBUILD | 20 ++- community/virtualbox-modules-lts/PKGBUILD | 4 +- 18 files changed, 95 insertions(+), 531 deletions(-) delete mode 100644 community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch delete mode 100644 community/gnome-panel/18_fix_force_quit_applet.patch delete mode 100644 community/gnome-panel/drop-gweather-xml-include.patch delete mode 100644 community/gnome-panel/fix-autoconf.patch delete mode 100644 community/gnome-panel/gnome-desktop-3.8.patch create mode 100644 community/gnome-panel/session.patch delete mode 100644 community/librcc/librcc-strnlen.patch (limited to 'community') diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 55030dbad..640938f07 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90010 2013-05-06 19:36:25Z foutrelis $ +# $Id: PKGBUILD 97670 2013-09-27 06:38:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=clanlib -pkgver=2.3.6 -pkgrel=5 +pkgver=3.0.0 +pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64') url="http://clanlib.org/" @@ -11,24 +11,24 @@ license=('zlib') depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl') makedepends=('doxygen' 'graphviz' 'mesa') options=('!libtool') -source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('aa037a8a6297fb0b2efd927b1b15e8de') +source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz) +md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3') build() { cd ${srcdir}/ClanLib-${pkgver} - ./configure --prefix=/usr --enable-docs --disable-clanGL1 + ./autogen.sh + ./configure --prefix=/usr make - # Somehow this breaks. :( - #make html + make html } package() { cd ${srcdir}/ClanLib-${pkgver} make DESTDIR=${pkgdir} install - #make DESTDIR=${pkgdir} install-html + make DESTDIR=${pkgdir} install-html install -d ${pkgdir}/usr/share/licenses/${pkgname} install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index f6a9528d9..77a7f7fb3 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 95268 2013-08-08 11:40:15Z jelle $ +# $Id: PKGBUILD 97709 2013-09-27 18:17:34Z jelle $ # Maintainer: Stéphane Gaudreault pkgname=cppcheck pkgver=1.61 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64') url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') -depends=('qt4') +depends=('qt5-base') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('fd81635612ba74a90b0ebe6d4c8a520826cc077c') @@ -20,7 +20,7 @@ build() { cd gui export HAVE_RULES=yes - qmake-qt4 + qmake make } diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index c045143b3..d4d820d93 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87044 2013-03-26 11:49:37Z foutrelis $ +# $Id: PKGBUILD 97721 2013-09-27 20:10:42Z bgyorgy $ # Maintainer: Balló György pkgname=dee -pkgver=1.0.14 -pkgrel=5 +pkgver=1.2.7 +pkgrel=1 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64') url="https://launchpad.net/dee" @@ -12,7 +12,7 @@ depends=('glib2' 'icu') makedepends=('python2' 'gobject-introspection' 'vala') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('473b4181e26538af0fb753255da7945c') +md5sums=('b92f27f0a99cac24c2128880601bb7d7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD index 3c243421c..6c4c847f0 100644 --- a/community/deja-dup/PKGBUILD +++ b/community/deja-dup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87385 2013-03-30 14:36:30Z bgyorgy $ +# $Id: PKGBUILD 97723 2013-09-27 20:25:48Z bgyorgy $ # Maintainer: Balló György pkgname=deja-dup -pkgver=26.0 +pkgver=28.0 pkgrel=1 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend" arch=('i686' 'x86_64') @@ -10,25 +10,24 @@ url="https://launchpad.net/deja-dup" license=('GPL') depends=('duplicity' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils') makedepends=('vala' 'intltool' 'itstool' 'nautilus') -optdepends=('nautilus: backup extension' +optdepends=('gnome-keyring: save passwords' + 'nautilus: backup extension' 'python2-boto: Amazon S3 backend' - 'python2-oauthlib: Ubuntu One backend' 'ubuntuone-client: Ubuntu One backend') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz - libsecret-1.vapi) -md5sums=('0430bbf03deac852651599a979a4cc32' - '27ca0a3c9efbe93e86ef563c77f6ddf3') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz) +md5sums=('480516869f49813880f2bbb35700c9af') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Python2 fix - sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala + sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala +} - # Add missing Vala API file - cp "$srcdir/libsecret-1.vapi" "vapi/libsecret-1.vapi" +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static --disable-schemas-compile --without-unity diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 36a4a254f..e2db19270 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94068 2013-07-13 16:36:05Z stativ $ +# $Id: PKGBUILD 97703 2013-09-27 17:44:03Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=8 -pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" +pkgrel=9 +pkgdesc="Qt4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64') url="http://fatrat.dolezel.info/" license=('GPL') diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch deleted file mode 100644 index c06949310..000000000 --- a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a5b951654b856d899e8c6a4116b4ccc4f18aac91 Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Sun, 24 Feb 2013 17:22:29 -0500 -Subject: [PATCH] Add the GNOME Flashback session - -This was removed from gnome-session 3.7.4 so let's it add it back here -(under new name) - -https://bugzilla.gnome.org/show_bug.cgi?id=694625 ---- - data/Makefile.am | 18 +++++++++++++++++- - data/gnome-flashback.desktop.in | 7 +++++++ - data/gnome-flashback.session.desktop.in | 3 +++ - po/POTFILES.in | 2 ++ - 4 files changed, 29 insertions(+), 1 deletion(-) - create mode 100644 data/gnome-flashback.desktop.in - create mode 100644 data/gnome-flashback.session.desktop.in - -diff --git a/data/Makefile.am b/data/Makefile.am -index 83f82e2..84e1954 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml) - - @GSETTINGS_RULES@ - -+sessiondir = $(datadir)/gnome-session/sessions -+session_in_files = gnome-flashback.session.desktop.in -+session_DATA = $(session_in_files:.session.desktop.in=.session) -+ -+xsessiondir = $(datadir)/xsessions -+xsession_in_files = gnome-flashback.desktop.in -+xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) -+ -+%.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -+ -+@INTLTOOL_DESKTOP_RULE@ -+ - default_layoutdir = $(datadir)/gnome-panel - default_layout_DATA = panel-default-layout.layout - - EXTRA_DIST = \ - $(gsettings_schemas_in_in) \ -+ $(session_in_files) \ -+ $(xsession_in_files) \ - $(default_layout_DATA) - - CLEANFILES = \ - $(gsettings__enum_file) \ - $(gsettings_SCHEMAS_in) \ - $(gsettings_SCHEMAS) \ -- *.gschema.valid -+ *.gschema.valid \ -+ $(session_DATA) \ -+ $(xsession_DATA) - - -include $(top_srcdir)/git.mk -diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in -new file mode 100644 -index 0000000..4856f75 ---- /dev/null -+++ b/data/gnome-flashback.desktop.in -@@ -0,0 +1,7 @@ -+[Desktop Entry] -+_Name=GNOME Flashback -+_Comment=This session logs you into GNOME with the traditional panel -+Exec=gnome-session --session=gnome-flashback -+TryExec=gnome-session -+Icon= -+Type=Application -diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in -new file mode 100644 -index 0000000..c012c58 ---- /dev/null -+++ b/data/gnome-flashback.session.desktop.in -@@ -0,0 +1,3 @@ -+[GNOME Session] -+_Name=GNOME Flashback -+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; -diff --git a/po/POTFILES.in b/po/POTFILES.in -index bc65c4c..a6aa6c7 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c - applets/wncklet/wncklet.c - applets/wncklet/workspace-switcher.c - [type: gettext/glade]applets/wncklet/workspace-switcher.ui -+data/gnome-flashback.desktop.in -+data/gnome-flashback.session.desktop.in - data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in - data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in - data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in --- -1.7.10.4 - diff --git a/community/gnome-panel/18_fix_force_quit_applet.patch b/community/gnome-panel/18_fix_force_quit_applet.patch deleted file mode 100644 index 8a72c9262..000000000 --- a/community/gnome-panel/18_fix_force_quit_applet.patch +++ /dev/null @@ -1,98 +0,0 @@ -Description: Fix Force-Quit panel applet - This patch implements handling of XInput2 extension events in the applet. - Without this patch, the applet fails to recognize such events (either mouse - click for killing application, or escape key for exiting), hence freezing the - desktop. - . - Also fix the event mask in call of gdk_device_grab() for keyboard. -Author: Sébastien Villemot -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698740 -Forwarded: no -Last-Update: 2013-01-28 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/gnome-panel/panel-force-quit.c -+++ b/gnome-panel/panel-force-quit.c -@@ -32,6 +32,8 @@ - #include - #include - -+#include -+ - #include "panel-icon-names.h" - #include "panel-stock-icons.h" - -@@ -246,22 +248,23 @@ - - static void - handle_button_press_event (GtkWidget *popup, -- XKeyEvent *event) -+ Display *display, -+ Window subwindow) - { - Window window; - - remove_popup (popup); - -- if (event->subwindow == None) -+ if (subwindow == None) - return; - - if (wm_state_atom == None) -- wm_state_atom = XInternAtom (event->display, "WM_STATE", FALSE); -+ wm_state_atom = XInternAtom (display, "WM_STATE", FALSE); - -- window = find_managed_window (event->display, event->subwindow); -+ window = find_managed_window (display, subwindow); - - if (window != None) { -- if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window)) -+ if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (display), window)) - kill_window_question ((gpointer) window); - } - } -@@ -272,10 +275,12 @@ - GtkWidget *popup) - { - XEvent *xevent = (XEvent *) gdk_xevent; -+ XIEvent *xiev; -+ XIDeviceEvent *xidev; - - switch (xevent->type) { - case ButtonPress: -- handle_button_press_event (popup, &xevent->xkey); -+ handle_button_press_event (popup, xevent->xbutton.display, xevent->xbutton.subwindow); - return GDK_FILTER_REMOVE; - case KeyPress: - if (xevent->xkey.keycode == XKeysymToKeycode (xevent->xany.display, XK_Escape)) { -@@ -283,6 +288,21 @@ - return GDK_FILTER_REMOVE; - } - break; -+ case GenericEvent: -+ xiev = (XIEvent *) xevent->xcookie.data; -+ xidev = (XIDeviceEvent *) xiev; -+ switch (xiev->evtype) { -+ case XI_KeyPress: -+ if (xidev->detail == XKeysymToKeycode (xevent->xany.display, XK_Escape)) { -+ remove_popup (popup); -+ return GDK_FILTER_REMOVE; -+ } -+ break; -+ case XI_ButtonPress: -+ handle_button_press_event (popup, xidev->display, xidev->child); -+ return GDK_FILTER_REMOVE; -+ } -+ break; - default: - break; - } -@@ -331,7 +351,7 @@ - - status = gdk_device_grab (keyboard, root, - GDK_OWNERSHIP_NONE, FALSE, -- GDK_KEY_PRESS | GDK_KEY_RELEASE, -+ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, - NULL, time); - if (status != GDK_GRAB_SUCCESS) { - g_warning ("Keyboard grab failed\n"); diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index 631d143af..4ae65559c 100644 --- a/community/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,53 +1,35 @@ -# $Id: PKGBUILD 96624 2013-09-02 13:22:45Z bgyorgy $ +# $Id: PKGBUILD 97693 2013-09-27 16:05:09Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan de Groot pkgbase=gnome-panel pkgname=('gnome-panel' 'gnome-flashback-session') -pkgver=3.6.2 -pkgrel=7 +pkgver=3.8.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') pkgdesc="Legacy GNOME panel" url="https://live.gnome.org/GnomePanel" depends=('dconf' 'evolution-data-server' 'gconf' 'gnome-desktop' 'gnome-menus' 'librsvg' 'libwnck3' 'telepathy-glib') -makedepends=('gobject-introspection' 'intltool' 'yelp-tools' 'networkmanager' 'gnome-common') +makedepends=('gobject-introspection' 'intltool' 'itstool' 'networkmanager') install=$pkgbase.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz - gnome-desktop-3.8.patch - drop-gweather-xml-include.patch - 18_fix_force_quit_applet.patch - 0001-Add-the-GNOME-Flashback-session.patch - fix-autoconf.patch) -sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079' - '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c' - 'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305' - '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775' - '79b6aab33bde167446ddea7f5c1a815dee150ba4a0678577464acbd2ba4a7504' - '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71') + session.patch) +sha256sums=('d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a' + 'cd4c21cf394ea5a702c660bb0d31cae31260bec1cee4e7ca8ee6c8aec2707ebb') -build() { +prepare() { cd "$pkgbase-$pkgver" - # Port to gnome-desktop 3.8 - patch -Np1 -i "$srcdir/gnome-desktop-3.8.patch" - - # Fix build with libgweather 3.8 - patch -Np0 -i "$srcdir/drop-gweather-xml-include.patch" - - # Fix force quit applet to avoid freeze - patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch" - - # Add GNOME Flashback session - # https://bugzilla.gnome.org/show_bug.cgi?id=694625 - patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch" + # Add more required components to the session file + patch -Np1 -i "$srcdir/session.patch" +} - # Fix build - patch -Np1 -i "$srcdir/fix-autoconf.patch" +build() { + cd "$pkgbase-$pkgver" - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgbase \ --disable-static --disable-schemas-compile \ PYTHON=/usr/bin/python2 @@ -58,11 +40,8 @@ package_gnome-panel() { cd "$pkgbase-$pkgver" make DESTDIR="$pkgdir" install - # Remove unneeded script - rm "$pkgdir/usr/lib/gnome-panel/gnome-panel-add" - # Split out the session files - rm -r "$pkgdir"/usr/share/{gnome-session,xsessions} + rm -r "$pkgdir"/usr/{lib/gnome-panel/gnome-*,share/{gnome-session,xsessions}} } package_gnome-flashback-session() { @@ -74,6 +53,7 @@ package_gnome-flashback-session() { install= cd "$pkgbase-$pkgver" + make -C gnome-panel DESTDIR="$pkgdir" install-libexecSCRIPTS make -C data DESTDIR="$pkgdir" install-sessionDATA make -C data DESTDIR="$pkgdir" install-xsessionDATA } diff --git a/community/gnome-panel/drop-gweather-xml-include.patch b/community/gnome-panel/drop-gweather-xml-include.patch deleted file mode 100644 index 3b3a559f0..000000000 --- a/community/gnome-panel/drop-gweather-xml-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600 -+++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600 -@@ -54,7 +54,6 @@ - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include - --#include - #include - #include - #include diff --git a/community/gnome-panel/fix-autoconf.patch b/community/gnome-panel/fix-autoconf.patch deleted file mode 100644 index 17d9e025c..000000000 --- a/community/gnome-panel/fix-autoconf.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur gnome-panel-3.6.2.orig/configure.ac gnome-panel-3.6.2/configure.ac ---- gnome-panel-3.6.2.orig/configure.ac 2012-11-12 18:51:14.000000000 +0100 -+++ gnome-panel-3.6.2/configure.ac 2013-04-10 14:50:14.132509059 +0200 -@@ -1,6 +1,6 @@ - AC_INIT([gnome-panel], [3.6.2], - [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - diff --git a/community/gnome-panel/gnome-desktop-3.8.patch b/community/gnome-panel/gnome-desktop-3.8.patch deleted file mode 100644 index 3c8823cd2..000000000 --- a/community/gnome-panel/gnome-desktop-3.8.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff -Naur gnome-panel-3.6.2.orig/applets/clock/calendar-window.c gnome-panel-3.6.2/applets/clock/calendar-window.c ---- gnome-panel-3.6.2.orig/applets/clock/calendar-window.c 2012-11-12 18:35:17.000000000 +0100 -+++ gnome-panel-3.6.2/applets/clock/calendar-window.c 2013-04-08 23:10:30.451012763 +0200 -@@ -42,9 +42,6 @@ - #include - #include - --#define GNOME_DESKTOP_USE_UNSTABLE_API --#include -- - #include "calendar-window.h" - - #include "clock.h" -@@ -168,6 +165,13 @@ - return; - } - -+ /* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */ -+ if (terminal) { -+ g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. " -+ "Please configure a different application.\n"); -+ return; -+ } -+ - command_line = g_find_program_in_path (program); - if (command_line == NULL) { - g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program); -@@ -189,9 +193,6 @@ - screen = gtk_widget_get_screen (calwin->priv->calendar); - error = NULL; - -- if (terminal) -- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); -- - display = gdk_screen_make_display_name (screen); - - result = g_spawn_async (NULL, /* working directory */ -diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c ---- gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c 2012-11-12 18:35:17.000000000 +0100 -+++ gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c 2013-04-08 23:10:52.408175181 +0200 -@@ -25,6 +25,7 @@ - * Havoc Pennington - * George Lebl - * Mark McLoughlin -+ * Tom Tromey (Copyright (C) 1998) - */ - - #include -@@ -42,8 +43,6 @@ - #include - #include - --#include -- - #include - #include - #include -@@ -335,6 +334,132 @@ - */ - } - -+ -+/** -+ * panel_run_dialog_prepend_terminal_to_vector: -+ * @argc: a pointer to the vector size -+ * @argv: a pointer to the vector -+ * -+ * Description: Prepends a terminal (either the one configured as default in -+ * the user's GNOME setup, or one of the common xterm emulators) to the passed -+ * in vector, modifying it in the process. The vector should be allocated with -+ * #g_malloc, as this will #g_free the original vector. Also all elements must -+ * have been allocated separately. That is the standard glib/GNOME way of -+ * doing vectors however. If the integer that @argc points to is negative, the -+ * size will first be computed. Also note that passing in pointers to a vector -+ * that is empty, will just create a new vector for you. -+ **/ -+/* TODO: throw out this function if there ever is a proper GAppInfo port */ -+static void -+panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv) -+{ -+ char **real_argv; -+ int real_argc; -+ int i, j; -+ char **term_argv = NULL; -+ int term_argc = 0; -+ GSettings *settings; -+ -+ gchar *terminal = NULL; -+ -+ char **the_argv; -+ -+ g_return_if_fail (argc != NULL); -+ g_return_if_fail (argv != NULL); -+ -+ /* sanity */ -+ if(*argv == NULL) -+ *argc = 0; -+ -+ the_argv = *argv; -+ -+ /* compute size if not given */ -+ if (*argc < 0) { -+ for (i = 0; the_argv[i] != NULL; i++) -+ ; -+ *argc = i; -+ } -+ -+ settings = g_settings_new ("org.gnome.desktop.default-applications.terminal"); -+ terminal = g_settings_get_string (settings, "exec"); -+ -+ if (terminal) { -+ gchar *command_line; -+ gchar *exec_flag; -+ -+ exec_flag = g_settings_get_string (settings, "exec-arg"); -+ -+ if (exec_flag == NULL) -+ command_line = g_strdup (terminal); -+ else -+ command_line = g_strdup_printf ("%s %s", terminal, -+ exec_flag); -+ -+ g_shell_parse_argv (command_line, -+ &term_argc, -+ &term_argv, -+ NULL /* error */); -+ -+ g_free (command_line); -+ g_free (exec_flag); -+ g_free (terminal); -+ } -+ -+ g_object_unref (settings); -+ -+ if (term_argv == NULL) { -+ char *check; -+ -+ term_argc = 2; -+ term_argv = g_new0 (char *, 3); -+ -+ check = g_find_program_in_path ("gnome-terminal"); -+ if (check != NULL) { -+ term_argv[0] = check; -+ /* Note that gnome-terminal takes -x and -+ * as -e in gnome-terminal is broken we use that. */ -+ term_argv[1] = g_strdup ("-x"); -+ } else { -+ if (check == NULL) -+ check = g_find_program_in_path ("nxterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("color-xterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("rxvt"); -+ if (check == NULL) -+ check = g_find_program_in_path ("xterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("dtterm"); -+ if (check == NULL) { -+ g_warning (_("Cannot find a terminal, using " -+ "xterm, even if it may not work")); -+ check = g_strdup ("xterm"); -+ } -+ term_argv[0] = check; -+ term_argv[1] = g_strdup ("-e"); -+ } -+ } -+ -+ real_argc = term_argc + *argc; -+ real_argv = g_new (char *, real_argc + 1); -+ -+ for (i = 0; i < term_argc; i++) -+ real_argv[i] = term_argv[i]; -+ -+ for (j = 0; j < *argc; j++, i++) -+ real_argv[i] = (char *)the_argv[j]; -+ -+ real_argv[i] = NULL; -+ -+ g_free (*argv); -+ *argv = real_argv; -+ *argc = real_argc; -+ -+ /* we use g_free here as we sucked all the inner strings -+ * out from it into real_argv */ -+ g_free (term_argv); -+} -+ - static gboolean - panel_run_dialog_launch_command (PanelRunDialog *dialog, - const char *command, -@@ -354,7 +479,7 @@ - screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog)); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox))) -- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); -+ panel_run_dialog_prepend_terminal_to_vector (&argc, &argv); - - display = gdk_screen_make_display_name (screen); - diff --git a/community/gnome-panel/session.patch b/community/gnome-panel/session.patch new file mode 100644 index 000000000..d288b41bb --- /dev/null +++ b/community/gnome-panel/session.patch @@ -0,0 +1,8 @@ +diff -Naur gnome-panel-3.8.0.orig/data/gnome-flashback.session.desktop.in gnome-panel-3.8.0/data/gnome-flashback.session.desktop.in +--- gnome-panel-3.8.0.orig/data/gnome-flashback.session.desktop.in 2013-09-27 03:12:58.291413318 +0000 ++++ gnome-panel-3.8.0/data/gnome-flashback.session.desktop.in 2013-09-27 03:15:34.183583841 +0000 +@@ -1,3 +1,3 @@ + [GNOME Session] + _Name=GNOME Flashback +-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity; ++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD index 9d761e88a..9b19965c1 100644 --- a/community/gtkspell3/PKGBUILD +++ b/community/gtkspell3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92677 2013-06-12 04:09:55Z bgyorgy $ +# $Id: PKGBUILD 97714 2013-09-27 20:04:38Z bgyorgy $ # Maintainer: Balló György # Contributor: Roman Kyrylych # Contributor: Ben pkgname=gtkspell3 -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 url="http://gtkspell.sourceforge.net/" pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" @@ -14,7 +14,7 @@ depends=('gtk3' 'enchant') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=(http://gtkspell.sourceforge.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('58f68a0fe9007d9a3d6092b222689320') +md5sums=('d25b547507940738cf016936c3452113') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD index fa2df29fc..9cfb000d9 100644 --- a/community/librcc/PKGBUILD +++ b/community/librcc/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 83682 2013-02-04 11:06:09Z spupykin $ +# $Id: PKGBUILD 97710 2013-09-27 19:26:53Z bgyorgy $ # Maintainer: Sergej Pupykin pkgname=librcc -pkgver=0.2.6 -pkgrel=5 +pkgver=0.2.10 +pkgrel=2 pkgdesc="Charset Conversion Library" arch=(i686 x86_64) url="http://rusxmms.sourceforge.net/" license=('GPL') -depends=(aspell enca libxml2 db librcd) -makedepends=(patch gtk gtk2) +depends=('aspell' 'enca' 'libxml2' 'librcd') +makedepends=('patch' 'gtk' 'gtk2') install=librcc.install options=('!libtool') -source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2 - librcc-strnlen.patch) -md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' - '040313d1d8f166ccf2b128cea4c05f21') +source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2) +md5sums=('077260cf58ae9624c964652b79fbb5fb') build() { cd $srcdir/$pkgname-${pkgver} - ./configure --prefix=/usr - patch -p1 <$srcdir/librcc-strnlen.patch + ./configure --prefix=/usr --disable-bdb make } diff --git a/community/librcc/librcc-strnlen.patch b/community/librcc/librcc-strnlen.patch deleted file mode 100644 index 9fc0e8b0b..000000000 --- a/community/librcc/librcc-strnlen.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h ---- librcc-0.2.6/src/rccstring.h 2006-01-08 15:42:59.000000000 +0000 -+++ librcc-0.2.6.qwe/src/rccstring.h 2009-09-28 08:45:37.000000000 +0000 -@@ -18,13 +18,6 @@ - int rccStringFixID(rcc_string string, rcc_context ctx); - int rccStringChangeID(rcc_string string, rcc_language_id language_id); - --#ifdef HAVE_STRNLEN --# ifndef strnlen --int strnlen(const char *str, size_t size); --# endif /* !strnlen */ --#else --int rccStrnlen(const char *str, size_t size); --#endif /* HAVE_STRNLEN */ - int rccIsASCII(const char *str); - size_t rccStringSizedGetChars(const char *str, size_t size); - diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD index 7fbd5a8e5..3b9315ed6 100755 --- a/community/ruby-iconv/PKGBUILD +++ b/community/ruby-iconv/PKGBUILD @@ -1,32 +1,40 @@ -# $Id: PKGBUILD 97425 2013-09-19 13:00:39Z alucryd $ +# $Id: PKGBUILD 97686 2013-09-27 08:51:25Z alucryd $ # Maintainer: Maxime Gauduin pkgname=ruby-iconv pkgver=1.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Wrapper library for iconv" arch=('i686' 'x86_64') url="https://github.com/nurse/iconv" license=('BSD') depends=('ruby') -source=("https://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem") +source=("http://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem") noextract=("${pkgname#*-}-${pkgver}.gem") sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da') -build() { - gem install --no-user-install --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem +prepare() { + gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem } package() { + cd gems/${pkgname#*-}-${pkgver} + local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')" - install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/${_rubyver},vendor_ruby/${_rubyver}/$CARCH-linux} - mv gems/${pkgname#*-}-${pkgver}/lib/* "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/ - mv doc specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/ + + install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/${_rubyver},vendor_ruby} + mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver} + +# Native extension + install -dm 755 "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/$CARCH-linux mv "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/{iconv,$CARCH-linux}/iconv.so +# Gem compatibility + mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/ + # License install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} - install -m 644 {gems/${pkgname#*-}-${pkgver},"${pkgdir}"/usr/share/licenses/${pkgname}}/BSDL + install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}BSDL } # vim: ts=2 sw=2 et: diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD index c9530fd58..b6831ab5d 100644 --- a/community/rust/PKGBUILD +++ b/community/rust/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 93472 2013-07-04 02:25:38Z thestinger $ +# $Id: PKGBUILD 97658 2013-09-27 01:45:47Z thestinger $ # Maintainer: Daniel Micay pkgname=rust -pkgver=0.7 +pkgver=0.8 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A safe, concurrent, practical language' url='http://www.rust-lang.org/' license=('MIT' 'Apache') depends=(gcc shared-mime-info) -makedepends=(libffi perl python2 curl chrpath emacs-nox) -optdepends=('haskell-pandoc: documentation generator (rustdoc)') -source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz") -sha256sums=('0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0') +makedepends=(libffi perl python2 curl chrpath) +source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz" + "http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz.asc") +sha256sums=('42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182' + 'SKIP') install=rust.install build() { @@ -51,12 +52,13 @@ package() { install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname" cd src/etc/emacs - make - mkdir -p "$pkgdir/usr/share/emacs/site-lisp/" - install -Dm644 cm-mode.el{,c} rust-mode.el{,c} "$pkgdir/usr/share/emacs/site-lisp/" + install -Dm644 rust-mode.el "$pkgdir/usr/share/emacs/site-lisp/rust-mode.el" cd "$pkgdir/usr" # https://github.com/mozilla/rust/issues/5219 chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so + + cd lib + ln -sf rustc/$CARCH-unknown-linux-gnu/lib/* . } diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 85bee4fb0..12cf2b8fe 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97616 2013-09-25 18:03:31Z bpiotrowski $ +# $Id: PKGBUILD 97688 2013-09-27 13:17:03Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Ionut Biru # Contributor: Sébastien Luttringer @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') pkgver=4.2.18 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -- cgit v1.2.3-54-g00ecf