diff options
Diffstat (limited to 'extra')
51 files changed, 645 insertions, 458 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index bd2a60214..f1c82b6ca 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188424 2013-06-13 21:55:40Z tomegun $ +# $Id: PKGBUILD 189679 2013-07-04 14:55:32Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs') -pkgver=5.5 -pkgrel=3 +pkgver=5.7 +pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -72,4 +72,4 @@ package_bluez-utils() { mv "$srcdir/_utils"/* "$pkgdir" } -md5sums=('cfe6bd2f7f3f45f689b3a21a6ba59edd') +md5sums=('eb883ce61753bd3f300a531bcc2af49e') diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 621c57386..de8f3d954 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185803 2013-05-19 09:33:05Z tpowa $ +# $Id: PKGBUILD 189657 2013-07-04 08:28:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=6.0 -pkgrel=2 +pkgver=6.1 +pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64 'mips64el') url="http://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -24,4 +24,4 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/usr/bin/mount.cifs } -md5sums=('371e007a201be90c16497cd9bd5e2553') +md5sums=('f83ef48ab1154aa74dd4cf1c1202bf04') diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index e0a9df0fd..73f595116 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187917 2013-06-08 07:00:54Z andrea $ +# $Id: PKGBUILD 189655 2013-07-04 07:18:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.11.1 +pkgver=2.8.11.2 pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('qt4: cmake-gui') install="${pkgname}.install" source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" 'imagemagick.patch') -md5sums=('df5324a3b203373a9e0a04b924281a43' +md5sums=('6f5d7b8e7534a5d9e1a7664ba63cf882' '19c4cf0e6e9c9a890f3698c9df8062f1') prepare() { diff --git a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch new file mode 100644 index 000000000..99f084930 --- /dev/null +++ b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch @@ -0,0 +1,26 @@ +From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Fri, 17 May 2013 11:32:03 +0100 +Subject: [PATCH] Fix failure to start with ENOTSOCK + +--- + CHANGELOG | 6 ++++++ + src/dnsmasq.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/dnsmasq.c b/src/dnsmasq.c +index 43b8cb1..b0f984d 100644 +--- a/src/dnsmasq.c ++++ b/src/dnsmasq.c +@@ -248,7 +248,7 @@ int main (int argc, char **argv) + #endif + + #if defined(HAVE_LINUX_NETWORK) && defined(HAVE_DHCP6) +- if (daemon->dhcp6) ++ if (daemon->doing_dhcp6) + bindtodevice(daemon->dhcp6fd); + #endif + } +-- +1.8.3.2 + diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 68e1007dd..590be4a7a 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183176 2013-04-18 12:45:45Z dreisner $ +# $Id: PKGBUILD 189772 2013-07-07 19:08:06Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq pkgver=2.66 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64' 'mips64el') @@ -15,15 +15,18 @@ install=$pkgname.install backup=('etc/dnsmasq.conf') source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" '0001-Fix-wrong-size-in-memset-call.patch' + '0001-Fix-failure-to-start-with-ENOTSOCK.patch' 'dnsmasq.service') md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20' '05ccefefde68ebdebce5e40d2b3c78be' + '98cc950a6b0482eb7e61969dafb4f764' '7ac45726cabef4145db40d758cc7fedf') prepare() { cd "$pkgname-$pkgver" patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch" + patch -Np1 <"$srcdir/0001-Fix-failure-to-start-with-ENOTSOCK.patch" } build() { diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD index 18c9d21d5..428421fe0 100644 --- a/extra/foobillard++/PKGBUILD +++ b/extra/foobillard++/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168755 2012-10-15 17:52:10Z eric $ +# $Id: PKGBUILD 189691 2013-07-04 19:58:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=foobillard++ pkgver=3.42beta -pkgrel=4 +pkgrel=5 pkgdesc="An OpenGL billiard game" arch=('i686' 'x86_64' 'mips64el') url="http://foobillardplus.sourceforge.net/" @@ -14,10 +14,14 @@ replaces=('foobillard') source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz) sha1sums=('51507efab0f595cfff26149003faf669c0a42f32') -build() { - cd "${srcdir}/foobillardplus-${pkgver}" +prepare() { + cd foobillardplus-${pkgver} sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop +} + +build() { + cd foobillardplus-${pkgver} aclocal --force autoconf -f autoheader -f @@ -27,7 +31,7 @@ build() { } package() { - cd "${srcdir}/foobillardplus-${pkgver}" + cd foobillardplus-${pkgver} make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \ prefix="${pkgdir}/usr/share" install diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index a7df534fb..39045563c 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187903 2013-06-07 22:41:57Z heftig $ +# $Id: PKGBUILD 189793 2013-07-08 08:16:03Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon pkgver=3.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,11 +14,21 @@ options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + git-fixes.patch) +sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c' + '30b0a42df9ea0c6c18ed51cb8f150008e4b5ab624eb420f0251d08ab2503c330') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../git-fixes.patch +} build() { cd $pkgname-$pkgver + aclocal + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static diff --git a/extra/gnome-settings-daemon/git-fixes.patch b/extra/gnome-settings-daemon/git-fixes.patch new file mode 100644 index 000000000..a56033ce1 --- /dev/null +++ b/extra/gnome-settings-daemon/git-fixes.patch @@ -0,0 +1,258 @@ +diff --git a/data/gnome-settings-daemon.desktop.in.in b/data/gnome-settings-daemon.desktop.in.in +index c5a5518..ff71eee 100644 +--- a/data/gnome-settings-daemon.desktop.in.in ++++ b/data/gnome-settings-daemon.desktop.in.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application + _Name=GNOME Settings Daemon +-Exec=@libexecdir@/gnome-settings-daemon ++Exec=@libexecdir@/gnome-settings-daemon-localeexec + OnlyShowIn=GNOME; + NoDisplay=true + X-GNOME-Autostart-Phase=Initialization +diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am +index 194a7cc..94b3861 100644 +--- a/gnome-settings-daemon/Makefile.am ++++ b/gnome-settings-daemon/Makefile.am +@@ -48,6 +48,15 @@ gsddir = $(libexecdir) + gsd_PROGRAMS = \ + gnome-settings-daemon + ++gsd_SCRIPTS = \ ++ gnome-settings-daemon-localeexec ++ ++EXTRA_DIST = \ ++ gnome-settings-daemon-localeexec.in ++ ++gnome-settings-daemon-localeexec: gnome-settings-daemon-localeexec.in ++ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@prefix\@|$(prefix)|" $< > $@.tmp && mv $@.tmp $@ ++ + apidir = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon + api_DATA = \ + gnome-settings-plugin.h +diff --git a/gnome-settings-daemon/gnome-settings-daemon-localeexec.in b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in +new file mode 100755 +index 0000000..eed91a4 +--- /dev/null ++++ b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++SETTING=$(gsettings get org.gnome.system.locale region) ++REGION=${SETTING#\'} ++REGION=${REGION%\'} ++ ++if [ -n "$REGION" ]; then ++ export LC_TIME=$REGION ++ export LC_NUMERIC=$REGION ++ export LC_MONETARY=$REGION ++ export LC_MEASUREMENT=$REGION ++ export LC_PAPER=$REGION ++fi ++ ++if [ -x @prefix@/bin/ibus-daemon ]; then ++ export QT_IM_MODULE=ibus ++ export XMODIFIERS=@im=ibus ++fi ++ ++exec @libexecdir@/gnome-settings-daemon +diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c +index 24c1598..16017df 100644 +--- a/gnome-settings-daemon/main.c ++++ b/gnome-settings-daemon/main.c +@@ -279,37 +279,6 @@ set_legacy_ibus_env_vars (GDBusProxy *proxy) + } + #endif + +-/* Keep synchronised with set_locale() and +- * set_legacy_ibus_env_vars() above */ +-static void +-set_locale_env (void) +-{ +- GSettings *locale_settings; +- gchar *region; +- +- /* Set locale environment */ +- locale_settings = g_settings_new ("org.gnome.system.locale"); +- region = g_settings_get_string (locale_settings, "region"); +- if (region[0]) { +- g_setenv ("LC_TIME", region, TRUE); +- g_setenv ("LC_NUMERIC", region, TRUE); +- g_setenv ("LC_MONETARY", region, TRUE); +- g_setenv ("LC_MEASUREMENT", region, TRUE); +- g_setenv ("LC_PAPER", region, TRUE); +- } +- g_free (region); +- g_object_unref (locale_settings); +- +-#ifdef HAVE_IBUS +- /* Set IBus legacy environment */ +- if (is_program_in_path ("ibus-daemon") && +- keyboard_plugin_is_enabled ()) { +- g_setenv ("QT_IM_MODULE", "ibus", TRUE); +- g_setenv ("XMODIFIERS", "@im=ibus", TRUE); +- } +-#endif +-} +- + static void + register_with_gnome_session (GDBusProxy *proxy) + { +@@ -499,8 +468,6 @@ main (int argc, char *argv[]) + + g_log_set_default_handler (gsd_log_default_handler, NULL); + +- set_locale_env (); +- + notify_init ("gnome-settings-daemon"); + + bus_register (); +diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c +index 45393ec..f51d520 100644 +--- a/plugins/housekeeping/gsd-housekeeping-manager.c ++++ b/plugins/housekeeping/gsd-housekeeping-manager.c +@@ -372,12 +372,20 @@ gboolean + gsd_housekeeping_manager_start (GsdHousekeepingManager *manager, + GError **error) + { ++ gchar *dir; ++ + g_debug ("Starting housekeeping manager"); + gnome_settings_profile_start (NULL); + + /* Create ~/.local/ as early as possible */ + g_mkdir_with_parents(g_get_user_data_dir (), 0700); + ++ /* Create ~/.local/share/applications/, see ++ * https://bugzilla.gnome.org/show_bug.cgi?id=703048 */ ++ dir = g_build_filename (g_get_user_data_dir (), "applications", NULL); ++ g_mkdir (dir, 0700); ++ g_free (dir); ++ + gsd_ldsm_setup (FALSE); + + manager->priv->settings = g_settings_new (THUMB_PREFIX); +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index e6380bd..96da3d1 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -261,11 +261,12 @@ gsd_power_manager_error_quark (void) + } + + static void +-notify_close_if_showing (NotifyNotification *notification) ++notify_close_if_showing (NotifyNotification **notification) + { +- if (notification == NULL) ++ if (*notification == NULL) + return; +- notify_notification_close (notification, NULL); ++ notify_notification_close (*notification, NULL); ++ g_clear_object (notification); + } + + typedef enum { +@@ -1214,7 +1215,7 @@ engine_ups_discharging (GsdPowerManager *manager, UpDevice *device) + icon = gpm_upower_get_device_icon (device, TRUE); + + /* close any existing notification of this class */ +- notify_close_if_showing (manager->priv->notification_ups_discharging); ++ notify_close_if_showing (&manager->priv->notification_ups_discharging); + + /* create a new notification */ + create_notification (title, message->str, +@@ -1424,7 +1425,7 @@ engine_charge_low (GsdPowerManager *manager, UpDevice *device) + icon = gpm_upower_get_device_icon (device, TRUE); + + /* close any existing notification of this class */ +- notify_close_if_showing (manager->priv->notification_low); ++ notify_close_if_showing (&manager->priv->notification_low); + + /* create a new notification */ + create_notification (title, message, +@@ -1597,7 +1598,7 @@ engine_charge_critical (GsdPowerManager *manager, UpDevice *device) + icon = gpm_upower_get_device_icon (device, TRUE); + + /* close any existing notification of this class */ +- notify_close_if_showing (manager->priv->notification_low); ++ notify_close_if_showing (&manager->priv->notification_low); + + /* create a new notification */ + create_notification (title, message, +@@ -1735,7 +1736,7 @@ engine_charge_action (GsdPowerManager *manager, UpDevice *device) + icon = gpm_upower_get_device_icon (device, TRUE); + + /* close any existing notification of this class */ +- notify_close_if_showing (manager->priv->notification_low); ++ notify_close_if_showing (&manager->priv->notification_low); + + /* create a new notification */ + create_notification (title, message, +@@ -1797,8 +1798,8 @@ engine_device_changed_cb (UpClient *client, UpDevice *device, GsdPowerManager *m + } else if (state == UP_DEVICE_STATE_FULLY_CHARGED || + state == UP_DEVICE_STATE_CHARGING) { + g_debug ("fully charged or charging, hiding notifications if any"); +- notify_close_if_showing (manager->priv->notification_low); +- notify_close_if_showing (manager->priv->notification_ups_discharging); ++ notify_close_if_showing (&manager->priv->notification_low); ++ notify_close_if_showing (&manager->priv->notification_ups_discharging); + main_battery_or_ups_low_changed (manager, FALSE); + } + +@@ -2268,7 +2269,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) + if (!up_client_get_on_battery (client)) { + /* if we are playing a critical charge sound loop on AC, stop it */ + play_loop_stop (&manager->priv->critical_alert_timeout_id); +- notify_close_if_showing (manager->priv->notification_low); ++ notify_close_if_showing (&manager->priv->notification_low); + main_battery_or_ups_low_changed (manager, FALSE); + } + +@@ -2638,7 +2639,7 @@ idle_configure (GsdPowerManager *manager) + &manager->priv->idle_dim_id); + clear_idle_watch (manager->priv->idle_monitor, + &manager->priv->idle_sleep_warning_id); +- notify_close_if_showing (manager->priv->notification_sleep_warning); ++ notify_close_if_showing (&manager->priv->notification_sleep_warning); + return; + } + +@@ -2705,7 +2706,7 @@ idle_configure (GsdPowerManager *manager) + } + + if (manager->priv->idle_sleep_warning_id == 0) +- notify_close_if_showing (manager->priv->notification_sleep_warning); ++ notify_close_if_showing (&manager->priv->notification_sleep_warning); + + /* set up dim callback for when the screen lock is not active, + * but only if we actually want to dim. */ +@@ -3038,7 +3039,7 @@ static void + show_sleep_warning (GsdPowerManager *manager) + { + /* close any existing notification of this class */ +- notify_close_if_showing (manager->priv->notification_sleep_warning); ++ notify_close_if_showing (&manager->priv->notification_sleep_warning); + + /* create a new notification */ + switch (manager->priv->sleep_action_type) { +@@ -3109,7 +3110,7 @@ idle_became_active_cb (GnomeIdleMonitor *monitor, + set_temporary_unidle_on_ac (manager, FALSE); + + /* close any existing notification about idleness */ +- notify_close_if_showing (manager->priv->notification_sleep_warning); ++ notify_close_if_showing (&manager->priv->notification_sleep_warning); + + idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); + } +@@ -3344,8 +3345,8 @@ handle_resume_actions (GsdPowerManager *manager) + { + /* close existing notifications on resume, the system power + * state is probably different now */ +- notify_close_if_showing (manager->priv->notification_low); +- notify_close_if_showing (manager->priv->notification_ups_discharging); ++ notify_close_if_showing (&manager->priv->notification_low); ++ notify_close_if_showing (&manager->priv->notification_ups_discharging); + main_battery_or_ups_low_changed (manager, FALSE); + + /* ensure we turn the panel back on after resume */ diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index 83525bdf0..918b23442 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188152 2013-06-10 16:22:47Z heftig $ +# $Id: PKGBUILD 189824 2013-07-08 16:53:47Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('b368a9220f9a50fecdb57ba8ce7008c65e3c236bc700325a45ecb806f3ab4651') +sha256sums=('5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22') build() { cd $pkgname-$pkgver diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 48928df3a..1be842221 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188597 2013-06-16 18:27:06Z heftig $ +# $Id: PKGBUILD 189695 2013-07-04 21:16:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.19 +pkgver=2.24.20 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8' +sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gtk2/gtk2.install b/extra/gtk2/gtk2.install index a988c645b..f14e648d3 100644 --- a/extra/gtk2/gtk2.install +++ b/extra/gtk2/gtk2.install @@ -1,16 +1,17 @@ post_install() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + /usr/bin/gtk-query-immodules-2.0 --update-cache } pre_upgrade() { - pre_remove + if (( $(vercmp $2 2.24.20) < 0 )); then + rm -f /etc/gtk-2.0/gtk.immodules + fi } post_upgrade() { - post_install + post_install } pre_remove() { - rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null + rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache } diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 5e8654b70..55015e684 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183417 2013-04-21 22:10:55Z heftig $ +# $Id: PKGBUILD 189822 2013-07-08 16:51:30Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('f08005bfa5ecb71b05c4046d585ae072f084c90003b281a3ced8d882b96fe3cd') +sha256sums=('1c2a01f1e04e3c8c9f09ff22f34f73f17b0e4e7ff0d83b2996c209bd02a6501b') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 66681ff2d..500aab551 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183196 2013-04-18 19:51:15Z eric $ +# $Id: PKGBUILD 189729 2013-07-06 17:47:53Z schiv $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,7 +6,7 @@ pkgname=ibus pkgver=1.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ibus.googlecode.com" diff --git a/extra/ibus/ibus.install b/extra/ibus/ibus.install index e4e446693..0b5ce0196 100644 --- a/extra/ibus/ibus.install +++ b/extra/ibus/ibus.install @@ -1,6 +1,6 @@ post_install() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-query-immodules-3.0 --update-cache + gtk-query-immodules-2.0 --update-cache + gtk-query-immodules-3.0 --update-cache gtk-update-icon-cache -fq -t usr/share/icons/hicolor @@ -8,8 +8,8 @@ post_install() { } post_remove() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-query-immodules-3.0 --update-cache + gtk-query-immodules-2.0 --update-cache + gtk-query-immodules-3.0 --update-cache gtk-update-icon-cache -fq -t usr/share/icons/hicolor diff --git a/extra/iniparser/PKGBUILD b/extra/iniparser/PKGBUILD new file mode 100644 index 000000000..c42825e7e --- /dev/null +++ b/extra/iniparser/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 189665 2013-07-04 11:16:11Z tpowa $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> + +pkgname=iniparser +pkgver=3.1 +pkgrel=3 +pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C" +arch=('i686' 'x86_64' 'mips64el') +url="http://ndevilla.free.fr/iniparser/" +license=('MIT') +depends=() +makedepends=('chrpath') +source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz) +md5sums=('0aa4f995468ed390caf323f50a285bc3') + +build() { + cd $srcdir/$pkgname + make +} + +package() { + cd $srcdir/$pkgname + install -Dm644 src/iniparser.h $pkgdir/usr/include/iniparser.h + install -Dm644 src/dictionary.h $pkgdir/usr/include/dictionary.h + install -Dm644 libiniparser.a $pkgdir/usr/lib/libiniparser.a + install -Dm644 libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so.0 + install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE + ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so + chrpath -d $pkgdir/usr/lib/libiniparser.so +} diff --git a/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff deleted file mode 100644 index bb588a072..000000000 --- a/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-19 20:01:25.676093296 +0000 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2013-05-19 20:01:54.312572109 +0000 -@@ -98,9 +98,9 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp --CPIO = $(UTILS_COMMAND_PATH)cpio -+CPIO = $(UTILS_USR_BIN_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df -@@ -108,13 +108,13 @@ - DIRNAME = $(UTILS_USR_BIN_PATH)dirname - DUMP = $(UTILS_CCS_BIN_PATH)dump - ECHO = $(UTILS_COMMAND_PATH)echo --EGREP = $(UTILS_COMMAND_PATH)egrep -+EGREP = $(UTILS_USR_BIN_PATH)egrep - EXPR = $(UTILS_USR_BIN_PATH)expr - FILE = $(UTILS_USR_BIN_PATH)file - FIND = $(UTILS_USR_BIN_PATH)find - FMT = $(UTILS_COMMAND_PATH)fmt - GDB = $(UTILS_USR_BIN_PATH)gdb --GREP = $(UTILS_COMMAND_PATH)grep -+GREP = $(UTILS_USR_BIN_PATH)grep - GUNZIP = $(UTILS_COMMAND_PATH)gunzip - # GZIP is used for solaris. Linux and windows use tar czf - GZIP = $(UTILS_COMMAND_PATH)gzip -@@ -148,7 +148,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname diff --git a/extra/java7-openjdk/02_fix_corba_cmds_path.diff b/extra/java7-openjdk/02_fix_corba_cmds_path.diff deleted file mode 100644 index 8a22e3229..000000000 --- a/extra/java7-openjdk/02_fix_corba_cmds_path.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.orig 2013-05-19 19:57:58.530784147 +0000 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2013-05-19 19:58:44.777147938 +0000 -@@ -83,9 +83,9 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp --CPIO = $(UTILS_COMMAND_PATH)cpio -+CPIO = $(UTILS_USR_BIN_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df -@@ -131,7 +131,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname -@@ -182,7 +182,7 @@ - # others have it in /usr/bin. - SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index a5f225cca..1b803b403 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188157 2013-06-10 20:38:57Z guillaume $ +# $Id: PKGBUILD 189830 2013-07-08 20:27:27Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -8,17 +8,17 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' pkgbase=java7-openjdk _java_ver=7 _updatever=u40 -_icedtea_ver=2.4.0 +_icedtea_ver=2.4.1 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am -_CORBA_CHANGESET=71d5ec2f3dfb -_JAXP_CHANGESET=5eaf3bca7f68 -_JAXWS_CHANGESET=9d2007a13c02 -_JDK_CHANGESET=29ce11184945 -_LANGTOOLS_CHANGESET=ffb1b6bc4750 -_OPENJDK_CHANGESET=9c74cb4a3ae8 +_CORBA_CHANGESET=23ae4e0e0cce +_JAXP_CHANGESET=5be6b670d08b +_JAXWS_CHANGESET=c0e48fdfb695 +_JDK_CHANGESET=65d95818d79e +_LANGTOOLS_CHANGESET=91c95fd8eea8 +_OPENJDK_CHANGESET=ae86c6974e8e -_HOTSPOT_CHANGESET=c67fd7874b1a # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map +_HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -43,24 +43,20 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz fontconfig-paths.diff - 01_fix_openjdk_cmds_path.diff - 02_fix_corba_cmds_path.diff openjdk7_nonreparenting-wm.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('be030583f0216151bd4b67b354085bf957b532d7bd2d67f14166bb6a1fc5497a' - '4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579' - '0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c' - '25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd' - '4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456' - '13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352' - '80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3' - '34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d' +sha256sums=('65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a' + 'f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a' + '618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395' + 'df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34' + '972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037' + '97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432' + '6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561' + 'f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9' - 'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' @@ -90,8 +86,6 @@ build() { cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ - patches/01_fix_openjdk_cmds_path.diff \ - patches/02_fix_corba_cmds_path.diff \ patches/openjdk7_nonreparenting-wm.diff" if [ "$_bootstrap" = "1" ]; then diff --git a/extra/ldb/PKGBUILD b/extra/ldb/PKGBUILD index 8c4a64db0..bf9471682 100644 --- a/extra/ldb/PKGBUILD +++ b/extra/ldb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182651 2013-04-12 07:10:22Z tpowa $ +# $Id: PKGBUILD 189674 2013-07-04 11:47:21Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Marco A Rojas <marquicus at gmail dot com> pkgname=ldb -pkgver=1.1.15 +pkgver=1.1.16 pkgrel=1 pkgdesc="A schema-less, ldap like, API and database" arch=('i686' 'x86_64' 'mips64el') @@ -37,4 +37,4 @@ package() { make DESTDIR=${pkgdir}/ install } -md5sums=('97ee9b455f6a547fb2b3b5a7836c41d7') +md5sums=('60865c0b5704469ee2e59703087c8ec8') diff --git a/extra/libpwquality/PKGBUILD b/extra/libpwquality/PKGBUILD index 12361009f..84eccf83c 100644 --- a/extra/libpwquality/PKGBUILD +++ b/extra/libpwquality/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: $ +# $Id: PKGBUILD 189651 2013-07-04 03:57:29Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libpwquality -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Library for password quality checking and generating random passwords" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('cracklib') optdepends=('python2: Python bindings') makedepends=('python2') source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2) -md5sums=('beb56c9028a713d936e04cc3c50c541d') +md5sums=('2105bb893791fe27efc20441e617f385') build() { cd "$pkgname-$pkgver" diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD new file mode 100644 index 000000000..db97cbc97 --- /dev/null +++ b/extra/libsidplayfp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 189835 2013-07-08 22:03:31Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Simon Perry <aur [at] sanxion [dot] net> +# Contributor: Jonas Nyrén <jonas.nyren*mindkiller.com> + +pkgname=libsidplayfp +pkgver=1.0.3 +pkgrel=2 +pkgdesc='Library to play Commodore 64 music derived from libsidplay2' +url='http://sourceforge.net/projects/sidplay-residfp/' +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('vice') +optdepends=('vice: better SID support') +source=("http://downloads.sourceforge.net/project/sidplay-residfp/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('967426a369122b9398c60be0e7d0b78753e23f3e') + +options=('!libtool' '!staticlibs') + +build() { + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/sidplayfp" + ln -t "${pkgdir}/usr/share/sidplayfp" -s /usr/lib/vice/C64/{kernal,basic,chargen} +} diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 5f8d193eb..a22906d59 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189266 2013-07-01 22:29:39Z lcarlier $ +# $Id: PKGBUILD 189755 2013-07-07 09:05:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') pkgver=9.1.4 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'wayland' 'systemd') @@ -96,8 +96,10 @@ package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" depends=("mesa-libgl=${pkgver}") + # vdpau driver is problematic, so remove it (FS#36004) install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ + rm -rf ${pkgdir}/usr/lib/vdpau/ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/ diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 4d760971d..a677f6969 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 184416 2013-05-06 19:39:00Z foutrelis $ +# $Id: PKGBUILD 189712 2013-07-05 15:55:50Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.5 -pkgrel=3 +pkgver=2.4.6 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -25,7 +25,7 @@ fi source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' 'fsh.patch') -md5sums=('8eac87462c7bec8b89021b723207c623' +md5sums=('c5e8758a419b4f258611b17fc83aafaf' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 2e9035390..06a523ebd 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187846 2013-06-07 04:00:16Z pierre $ +# $Id: PKGBUILD 189704 2013-07-05 05:55:47Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.16 +pkgver=5.4.17 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('3d2c694d28861d707b2622c3cc941cff' +md5sums=('1e027e99e2a874310fd518e87e3947af' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 63eca9541..0e3c4add9 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188927 2013-06-25 16:51:15Z andyrtr $ +# $Id: PKGBUILD 189647 2013-07-04 03:26:07Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -11,8 +11,8 @@ _dcpkgver=2.2.4 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.4.0 -pkgrel=5 +pkgver=0.4.1 +pkgrel=1 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" @@ -22,7 +22,7 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('e630d0c73e9c60028c5d25780eb38eda556ca7a5983cc07b7c0ac8490c4a7fa5' +sha256sums=('361cf61c1b6c8a42d841d694736dac99c6bb5b5166e050a95c185119399c696e' 'SKIP' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 9e1f2fe63..cd51f80a7 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185354 2013-05-13 17:22:22Z heftig $ +# $Id: PKGBUILD 189725 2013-07-06 02:03:20Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 arch=(i686 x86_64 mips64el) url="https://live.gnome.org/PyGObject" @@ -11,7 +11,7 @@ license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('caa6507edb8cca56e781bf927d88ce99581e1df9978b59a3360cfb74bd9c15f5') +sha256sums=('384b3e1b8d1e7c8796d7eb955380d62946dd0ed9c54ecf0817af2d6b254e082c') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD index 030af8e0f..f2b715c3a 100644 --- a/extra/pygobject2/PKGBUILD +++ b/extra/pygobject2/PKGBUILD @@ -1,80 +1,71 @@ -# $Id: PKGBUILD 169377 2012-10-20 09:01:36Z heftig $ +# $Id: PKGBUILD 189818 2013-07-08 14:49:55Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=pygobject2 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) pkgver=2.28.6 -pkgrel=8.1 +pkgrel=9 arch=('i686' 'x86_64' 'mips64el') url="http://www.pygtk.org/" -license=('LGPL') -makedepends=('python' 'python2') -source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz - python2-fix-type.patch - python3-fix-build.patch - python3-fix-maketrans.patch) +license=(LGPL) +makedepends=(python python2 git) options=('!libtool') -sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' - 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea' - 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' - '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') -build() { - cd pygobject-$pkgver +# pygobject-2-28 branch: https://git.gnome.org/browse/pygobject/log/?h=pygobject-2-28 +source=('git://git.gnome.org/pygobject#commit=9456ba7') +sha256sums=('SKIP') - # patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python2-fix-type.patch" - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" +prepare() { + cd pygobject + autoreconf -fi cd .. - cp -a "pygobject-${pkgver}" python2-build + cp -a pygobject python2-build +} - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr --disable-introspection - make - ) +build() { + cd python2-build + ./configure --prefix=/usr --disable-introspection \ + PYTHON=/usr/bin/python2 + make - ( - cd "pygobject-${pkgver}" - ./configure --prefix=/usr --disable-introspection - make - ) + cd ../pygobject + ./configure --prefix=/usr --disable-introspection + make } package_python-gobject2() { pkgdesc="Python 3 bindings for GObject2" - depends=('glib2' 'pygobject2-devel' 'python') - replaces=('py3gobject') + depends=(glib2 pygobject2-devel python) + replaces=(py3gobject) provides=("py3gobject=$pkgver") - cd pygobject-${pkgver} - make DESTDIR="${pkgdir}" install + cd pygobject + make DESTDIR="$pkgdir" install # Delete devel stuff - rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} + rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} } package_python2-gobject2() { pkgdesc="Python 2 bindings for GObject2" - depends=('glib2' 'pygobject2-devel' 'python2') - replaces=('pygobject') + depends=(glib2 pygobject2-devel python2) + replaces=(pygobject) provides=("pygobject=$pkgver") cd python2-build - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install + + find "$pkgdir"/usr/share/pygobject -name '*.py' -exec \ + sed -i '1s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' {} + - find "$pkgdir"/usr/share/pygobject -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + rm -r "$pkgdir"/usr/share/gtk-doc # Split devel stuff cd .. mkdir -p devel/usr/{lib,share/pygobject} mv {"$pkgdir",devel}/usr/include mv {"$pkgdir",devel}/usr/lib/pkgconfig - mv {"$pkgdir",devel}/usr/share/gtk-doc mv {"$pkgdir",devel}/usr/share/pygobject/xsl } diff --git a/extra/pygobject2/python2-fix-type.patch b/extra/pygobject2/python2-fix-type.patch deleted file mode 100644 index 78e7ddfd5..000000000 --- a/extra/pygobject2/python2-fix-type.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Mon, 12 Mar 2012 16:44:14 -0400 -Subject: gio-types.defs: change some enums to flags - -These flags types were originally incorrectly handled in glib as being -enums. That bug was fixed, but they're still enums here, leading to -warnings about the mismatch. - -Change them to flags. - -https://bugzilla.gnome.org/show_bug.cgi?id=668522 ---- - gio/gio-types.defs | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gio-types.defs b/gio/gio-types.defs -index 331e0bc..7eee5c8 100644 ---- a/gio/gio-types.defs -+++ b/gio/gio-types.defs -@@ -526,7 +526,7 @@ - ) - ) - --(define-enum MountMountFlags -+(define-flags MountMountFlags - (in-module "gio") - (c-name "GMountMountFlags") - (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") -@@ -545,7 +545,7 @@ - ) - ) - --(define-enum DriveStartFlags -+(define-flags DriveStartFlags - (in-module "gio") - (c-name "GDriveStartFlags") - (gtype-id "G_TYPE_DRIVE_START_FLAGS") -@@ -770,7 +770,7 @@ - ) - ) - --(define-enum SocketMsgFlags -+(define-flags SocketMsgFlags - (in-module "gio") - (c-name "GSocketMsgFlags") - (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") --- -1.7.9.1 - diff --git a/extra/pygobject2/python3-fix-build.patch b/extra/pygobject2/python3-fix-build.patch deleted file mode 100644 index 4cb8cfe57..000000000 --- a/extra/pygobject2/python3-fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <icq@gnome.org> -Date: Thu, 21 Apr 2011 14:52:20 +0000 -Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore - ---- -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 81b9865..edf52d7 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -30,7 +30,7 @@ - #include <pycairo/py3cairo.h> - #endif - --Pycairo_CAPI_t *Pycairo_CAPI; -+static Pycairo_CAPI_t *Pycairo_CAPI; - - #include "pygi-foreign.h" - -@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, - static PyMethodDef _gi_cairo_functions[] = {0,}; - PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - { -+#if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; -+#else -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+#endif -+ - if (Pycairo_CAPI == NULL) - return PYGLIB_MODULE_ERROR_RETURN; - --- -cgit v0.9 diff --git a/extra/pygobject2/python3-fix-maketrans.patch b/extra/pygobject2/python3-fix-maketrans.patch deleted file mode 100644 index f5bc0e77c..000000000 --- a/extra/pygobject2/python3-fix-maketrans.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Wed, 13 Jul 2011 06:42:22 +0000 -Subject: [python3] Fix maketrans import - -Python3 moved the maketrans() function from the string module to a str method. -This unbreaks gi/module.py for Python 3 again. ---- -diff --git a/gi/module.py b/gi/module.py -index 70df76c..d56bdaf 100644 ---- a/gi/module.py -+++ b/gi/module.py -@@ -24,7 +24,11 @@ from __future__ import absolute_import - - import os - import gobject --import string -+try: -+ maketrans = ''.maketrans -+except AttributeError: -+ # fallback for Python 2 -+ from string import maketrans - - import gi - from .overrides import registry -@@ -124,7 +128,7 @@ class IntrospectionModule(object): - # Don't use upper() here to avoid locale specific - # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') - # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 -- ascii_upper_trans = string.maketrans( -+ ascii_upper_trans = maketrans( - 'abcdefgjhijklmnopqrstuvwxyz', - 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') - for value_info in info.get_values(): --- -cgit v0.9 diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 1de3bee15..57c0787f5 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184428 2013-05-06 19:39:31Z foutrelis $ +# $Id: PKGBUILD 189742 2013-07-06 18:49:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -10,15 +10,22 @@ pkgname=('qt5-base' # V8 is not ported yet to mips64el, don't build jsbackend and its reverse dependencies there. [ "$CARCH" != "mips64el" ] && pkgname+=( 'qt5-declarative' - 'qt5-doc' 'qt5-graphicaleffects' 'qt5-jsbackend' 'qt5-multimedia' 'qt5-quick1' + 'qt5-quickcontrols' + 'qt5-script' + 'qt5-sensors' + 'qt5-serialport' + 'qt5-svg' 'qt5-tools' - 'qt5-translations') -pkgver=5.0.2 -pkgrel=2 + 'qt5-translations' + 'qt5-webkit' + 'qt5-x11extras' + 'qt5-xmlpatterns') +pkgver=5.1.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -27,29 +34,25 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' - 'libmng' 'openal' 'gtk2') + 'libmng' 'openal' 'gtk2' 'libxkbcommon') [ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient') groups=('qt' 'qt5') options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'use-python2.patch' 'gcc48.patch' - 'qatomic-before-mips32.patch') -md5sums=('2cab3518d86fe8f0638c7faea8b46397' - 'f1837a03fd0ebbd2da58975845f278e3' - '480fea1ed076992b688373c8db274be0' - '5595c24d5bb942c21e3a4d299e6d0bf1' - 'd6ab43fb371be494e3bfd9b210c40bf1' - '7927028e2374321c78a76df858e723d6' +source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' + 'use-python2.patch' 'qatomic-before-mips32.patch') +md5sums=('44a507beebef73eb364b5a2ec7bbe090' + 'b2897dd6a2967bccf8f10e397aafee55' + '9638a78e502719ef8fe5f8d10d0361a9' + '188da8f4c87316e730ebf1c6217bf5a0' + '322b419b16c75d4de0ee7ad0a246caa1' + '92831f79144d5cb8121915423ba47575' '84d7fcc2b5f270f482d5522ae01c29e2') -build() { +prepare() { cd ${_pkgfqn} - export QTDIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf @@ -60,18 +63,20 @@ build() { -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') - [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase" - # Fix build without -march=mips32, mips64 or its superset. patch -p1 -i "$srcdir/qatomic-before-mips32.patch" +} + +build() { + cd ${_pkgfqn} - # GCC 4.8 fixes - cd qtbase - patch -p1 -i "${srcdir}"/gcc48.patch - cd ../ + export QTDIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} +# disable firebird on mips64el + [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase" - ./configure -confirm-license -opensource \ + PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \ -prefix /usr \ -bindir /usr/lib/qt/bin \ -docdir /usr/share/doc/qt \ @@ -115,12 +120,11 @@ package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser') + 'icu' 'qtchooser' 'libxkbcommon') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver') [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver') - install='qt5-base.install' conflicts=('qt') cd ${_pkgfqn}/qtbase @@ -164,26 +168,6 @@ package_qt5-declarative() { done } -package_qt5-doc() { - pkgdesc='A cross-platform application and UI framework (Documentation and Examples)' - depends=('qt5-base') - conflicts=('qt-doc') - replaces=('qt-doc') - provides=('qt-doc') - options=('docs') - groups=() - - cd ${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install_docs - - for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ - qtwebkit-examples-and-demos qtxmlpatterns; do - cd ${m}/examples - make INSTALL_ROOT="${pkgdir}" install - cd ../../ - done -} - package_qt5-jsbackend() { pkgdesc='A cross-platform application and UI framework (QtV8)' depends=('qt5-base') @@ -265,6 +249,20 @@ package_qt5-quick1() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-quickcontrols() { + pkgdesc='A cross-platform application and UI framework (QtQuick)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtquickcontrols + make INSTALL_ROOT="${pkgdir}" install } package_qt5-script() { @@ -280,6 +278,30 @@ package_qt5-script() { -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } +package_qt5-sensors() { + pkgdesc='A cross-platform application and UI framework (QtSensors)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtsensors + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-serialport() { + pkgdesc='A cross-platform application and UI framework (QtSerialPort)' + depends=('qt5-base') + + cd ${_pkgfqn}/qtserialport + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + package_qt5-svg() { pkgdesc='A cross-platform application and UI framework (QtSvg)' depends=('qt5-base') @@ -295,7 +317,8 @@ package_qt5-svg() { package_qt5-tools() { pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' - depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations') + depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme' + 'xdg-utils') optdepends=('qt5-doc: documentation') install='qt5-tools.install' conflicts=('qt') @@ -310,14 +333,18 @@ package_qt5-tools() { "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" done - install -p -D -m644 src/assistant/assistant/images/assistant.png \ + install -D -m644 src/assistant/assistant/images/assistant.png \ "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" - install -p -D -m644 src/assistant/assistant/images/assistant-128.png \ + install -D -m644 src/assistant/assistant/images/assistant-128.png \ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png" - install -p -D -m644 src/designer/src/designer/images/designer.png \ + install -D -m644 src/designer/src/designer/images/designer.png \ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdbusviewer.png" install -d "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}"/{linguist,designer,assistant}.desktop \ + install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}.desktop \ "${pkgdir}/usr/share/applications/" # Fix wrong path in prl files @@ -333,7 +360,7 @@ package_qt5-tools() { package_qt5-webkit() { pkgdesc='A cross-platform application and UI framework (QtWebKit)' - depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite') + depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite' 'qt5-sensors') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install @@ -345,3 +372,15 @@ package_qt5-webkit() { # Fix wrong path in pc file perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc } + +package_qt5-x11extras() { + pkgdesc='A cross-platform application and UI framework (QtX11Extras)' + depends=('qt5-base') + + cd ${_pkgfqn}/qtx11extras + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} diff --git a/extra/qt5/assistant.desktop b/extra/qt5/assistant.desktop index 37ff84b44..9d6100438 100644 --- a/extra/qt5/assistant.desktop +++ b/extra/qt5/assistant.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Qt Assistant Comment=Shows Qt documentation and examples -Exec=/usr/bin/assistant +Exec=/usr/lib/qt/bin/assistant Icon=assistant Terminal=false Type=Application diff --git a/extra/qt5/designer.desktop b/extra/qt5/designer.desktop index f0b381d02..86aefe020 100644 --- a/extra/qt5/designer.desktop +++ b/extra/qt5/designer.desktop @@ -2,7 +2,7 @@ Name=Qt Designer GenericName=Interface Designer Comment=Design GUIs for Qt applications -Exec=/usr/bin/designer +Exec=/usr/lib/qt/bin/designer Icon=designer MimeType=application/x-designer; Terminal=false diff --git a/extra/qt5/linguist.desktop b/extra/qt5/linguist.desktop index 3b203e0bd..c6d1aa4ba 100644 --- a/extra/qt5/linguist.desktop +++ b/extra/qt5/linguist.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Qt Linguist Comment=Add translations to Qt applications -Exec=/usr/bin/linguist +Exec=/usr/lib/qt/bin/linguist Icon=linguist MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false diff --git a/extra/qt5/qdbusviewer.desktop b/extra/qt5/qdbusviewer.desktop new file mode 100644 index 000000000..9165b6feb --- /dev/null +++ b/extra/qt5/qdbusviewer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=/usr/lib/qt/bin/qdbusviewer +Icon=qdbusviewer +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; diff --git a/extra/qt5/qt5-base.install b/extra/qt5/qt5-base.install deleted file mode 100644 index c0797237a..000000000 --- a/extra/qt5/qt5-base.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch index eb53b10f6..57487b996 100644 --- a/extra/qt5/use-python2.patch +++ b/extra/qt5/use-python2.patch @@ -105,3 +105,14 @@ for(program, requiredPrograms): \ !programExistsInPath($$program): \ addReasonForSkippingBuild("Missing $$program from PATH") +--- qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp.old 2013-07-03 19:22:34.536705691 +0000 ++++ qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp 2013-07-03 19:22:25.606770334 +0000 +@@ -99,7 +99,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', + ], + 'action': [ +- 'python', ++ 'python2', + '../tools/js2c.py', + '<@(_outputs)', + 'D8', diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index f45b52785..d809ad4c7 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,12 +10,12 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.6 +pkgver=4.0.7 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.6 -pkgrel=1 +_realver=4.0.7 +pkgrel=3 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -177,7 +177,7 @@ depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb' package_samba() { pkgdesc="SMB Fileserver and AD Domain server" depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1' - 'talloc' 'ldb' 'libbsd' 'python2' 'tdb' "smbclient>=$pkgver") + 'talloc' 'ldb' 'libbsd' 'python2' 'tdb' 'iniparser' 'libaio' "smbclient>=$pkgver") backup=(etc/logrotate.d/samba etc/pam.d/samba etc/samba/smb.conf @@ -245,7 +245,8 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('db9dc684f167a602c18acc19d3e7e401' + +md5sums=('d887c1383654fc60b7bb1b74d273a826' '5697da77590ec092cc8a883bae06093c' 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index cb888f1ff..c6574a0d3 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 188488 2013-06-15 00:05:52Z bisson $ +# $Id: PKGBUILD 189752 2013-07-07 08:50:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim pkgver=1.4.14 -pkgrel=4 +pkgrel=5 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('LGPL') diff --git a/extra/scim/install b/extra/scim/install index ae6ea9d56..66912523a 100644 --- a/extra/scim/install +++ b/extra/scim/install @@ -1,6 +1,6 @@ post_install() { - [[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - [[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules + [[ -x usr/bin/gtk-query-immodules-2.0 ]] && gtk-query-immodules-2.0 --update-cache + [[ -x usr/bin/gtk-query-immodules-3.0 ]] && gtk-query-immodules-3.0 --update-cache true } diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 3169b1d34..5e0a9ee44 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 188189 2013-06-12 11:20:08Z bpiotrowski $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 189775 2013-07-07 23:18:58Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.10 +pkgver=1.8.0 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') @@ -28,17 +29,19 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.as svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('4088a77e14232876c9b4ff1541e6e200' +md5sums=('f053a9948dfe5c70eff5c00509723214' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' 'e8020c7a1d1a0c47091b5fdd034f81c5' '6b4340ba9d8845cd8497e013ae01be3f') + + build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 - patch -Np0 -i ../subversion.rpath.fix.patch + #patch -Np0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py if [ "$CARCH" = "mips64el" ]; then @@ -55,7 +58,7 @@ build() { --disable-static fi - make external-all + #make external-all make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl #swig-rb diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD index b376562bb..23e93d60a 100644 --- a/extra/tdb/PKGBUILD +++ b/extra/tdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172510 2012-12-04 14:40:09Z tpowa $ +# $Id: PKGBUILD 189676 2013-07-04 11:53:29Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=tdb -pkgver=1.2.11 -pkgrel=1.1 +pkgver=1.2.12 +pkgrel=1 pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits" arch=(i686 x86_64 'mips64el') license=('GPL3') @@ -33,4 +33,4 @@ package() { export PYTHON=/usr/bin/python2 make DESTDIR=$pkgdir/ install } -md5sums=('67dcc5507213ec8c9664234fae095538') +md5sums=('53e6168a7c2c93735a1c024fd2c3a7b4') diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index b01553131..d0a44ffc3 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,20 +1,17 @@ -# $Id: PKGBUILD 186895 2013-05-31 15:05:32Z foutrelis $ +# $Id: PKGBUILD 189680 2013-07-04 14:55:33Z tomegun $ +# Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.77 -pkgrel=3 +pkgver=2.80 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') -source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz - transmission.systemd - transmission.tmpfiles) -md5sums=('60c0e77a1852656215f7102a437b2a3d' - '5c289c8901221a94be74665368ab5c2c' - '23f2320361ad54373c3a4551ef634fe8') +source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz) +md5sums=('2bde600d4b0a75d0bd3784550d59a8af') build() { cd $pkgbase-$pkgver @@ -27,7 +24,7 @@ build() { } package_transmission-cli() { pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" - depends=('curl' 'libevent') + depends=('curl' 'libevent' 'systemd') install=transmission-cli.install cd $pkgbase-$pkgver @@ -37,8 +34,7 @@ package_transmission-cli() { make -C "$dir" DESTDIR="$pkgdir" install done - install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" - install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" + install -D -m644 "$srcdir/transmission-$pkgver/daemon/transmission-daemon.service" "$pkgdir/usr/lib/systemd/system/transmission.service" install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" } diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index b0832042c..1af0f87e8 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -7,5 +7,4 @@ post_upgrade() { # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files getent group transmission >/dev/null || groupadd -g 169 transmission getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission - systemd-tmpfiles --create transmission.conf } diff --git a/extra/transmission/transmission.systemd b/extra/transmission/transmission.systemd deleted file mode 100644 index 56ab8f794..000000000 --- a/extra/transmission/transmission.systemd +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Transmission Bit Torrent Daemon - -# This assumes that a user 'transmission' exists, with a writeable homedirectory, -# and that /run/transmission exists and is writeable by the transmission user. - -[Service] -User=transmission -Type=forking -PIDFile=/run/transmission/transmission.pid -ExecStart=/usr/bin/transmission-daemon --pid-file /run/transmission/transmission.pid - -[Install] -WantedBy=multi-user.target diff --git a/extra/transmission/transmission.tmpfiles b/extra/transmission/transmission.tmpfiles deleted file mode 100644 index b603066c1..000000000 --- a/extra/transmission/transmission.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/transmission - transmission transmission - diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 7128a15fa..34cde25f7 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,24 +6,22 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=918 -__hgrev=c61da758a9a2 +_patchlevel=1287 +__hgrev=941318315ace _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'pythoncomplete.vim::http://www.vim.org/scripts/download_script.php?src_id=10872' 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('b1a619f017851646a8567deda17bdb36' +md5sums=('e43d2b39c51246ad8dba45d0d75748ec' 'SKIP' - '6e7adfbd5d26c1d161030ec203a7f243' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' 'd90413bd21f400313a785bb4010120cd') @@ -211,10 +209,6 @@ package_vim-runtime() { sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - # make Aaron happy - install -Dm644 "${srcdir}"/pythoncomplete.vim \ - "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim - # rc files install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc install -Dm644 "${srcdir}"/archlinux.vim \ diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index a2cc1a60a..dc7797ce1 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188151 2013-06-10 16:21:56Z heftig $ +# $Id: PKGBUILD 189823 2013-07-08 16:52:35Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.6 +pkgver=0.34.7 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('e1dcc30ec8df24ec5f7f100ca231ab96da0e560b0bfddec3617c962943d8f3f3') +sha256sums=('187e49cca574f548d04ceea701e95a1531ff9dd9cd1953ce6455824720dab932') build() { cd "vte-$pkgver" diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 5ce40ab10..1821e9d9d 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180189 2013-03-18 16:08:58Z andyrtr $ +# $Id: PKGBUILD 189777 2013-07-08 07:06:15Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.20.0 -pkgrel=2 +pkgver=0.21.0 +pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwacom.sourceforge.net/" @@ -18,7 +18,7 @@ optdepends=('inputattach: support for serial tablets') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 70-wacom.rules) -md5sums=('a726649cb05c98cb1b18a3b7a4f079ed' +md5sums=('534784a3a776451c2572e2b666266f36' 'cc46dcb399d5ee62c9feb610c60d1270') build() { diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index b12f31c7f..bf4c67f28 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 184294 2013-05-05 17:50:37Z foutrelis $ +# $Id: PKGBUILD 189759 2013-07-07 14:26:30Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit' - 'hicolor-icon-theme') + 'xorg-xrdb' 'hicolor-icon-theme') makedepends=('intltool' 'xfce4-dev-tools') optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled' 'xscreensaver: for locking screen with xflock4' diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 05f9129a2..0ce506e02 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186582 2013-05-29 15:27:30Z andyrtr $ +# $Id: PKGBUILD 189748 2013-07-07 08:14:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=293 +pkgver=295 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('f9dc37486d5f1e550b6dc2e26a8a0439' +md5sums=('5a11e78d3504c859e8b16f7bbe03b0d1' '10ecc3f8ee91e3189863a172f68282d2') build() { |