From 10aa61ef39e662453e1d817046e359372fe3b326 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 9 Jul 2013 01:22:21 -0700 Subject: Tue Jul 9 01:22:19 PDT 2013 --- extra/gnome-settings-daemon/PKGBUILD | 18 +- extra/gnome-settings-daemon/git-fixes.patch | 258 ++++++++++++++++++++++ extra/gnome-terminal/PKGBUILD | 6 +- extra/gtksourceview3/PKGBUILD | 6 +- extra/java7-openjdk/01_fix_openjdk_cmds_path.diff | 39 ---- extra/java7-openjdk/02_fix_corba_cmds_path.diff | 32 --- extra/java7-openjdk/PKGBUILD | 40 ++-- extra/libsidplayfp/PKGBUILD | 31 +++ extra/pygobject2/PKGBUILD | 75 +++---- extra/pygobject2/python2-fix-type.patch | 50 ----- extra/pygobject2/python3-fix-build.patch | 34 --- extra/pygobject2/python3-fix-maketrans.patch | 36 --- extra/subversion/PKGBUILD | 15 +- extra/vte3/PKGBUILD | 6 +- extra/xf86-input-wacom/PKGBUILD | 8 +- 15 files changed, 375 insertions(+), 279 deletions(-) create mode 100644 extra/gnome-settings-daemon/git-fixes.patch delete mode 100644 extra/java7-openjdk/01_fix_openjdk_cmds_path.diff delete mode 100644 extra/java7-openjdk/02_fix_corba_cmds_path.diff create mode 100644 extra/libsidplayfp/PKGBUILD delete mode 100644 extra/pygobject2/python2-fix-type.patch delete mode 100644 extra/pygobject2/python3-fix-build.patch delete mode 100644 extra/pygobject2/python3-fix-maketrans.patch (limited to 'extra') diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 5fff6c3b4..beb1607a9 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) pkgname=gnome-settings-daemon pkgver=3.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') 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 72cd0697d..ac374672a 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 pkgname=gnome-terminal -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=(i686 x86_64) @@ -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/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 12719afc1..4e4f8aeb7 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 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') @@ -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/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 # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot @@ -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/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 +# Contributor: Simon Perry +# Contributor: Jonas Nyrén + +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/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD index b8521ed97..9e9720264 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 pkgbase=pygobject2 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) pkgver=2.28.6 -pkgrel=8 -arch=('i686' 'x86_64') +pkgrel=9 +arch=(i686 x86_64) 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 -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 -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 - #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 -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/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 30aa977a8..90728c84c 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 +# $Id: PKGBUILD 189775 2013-07-07 23:18:58Z angvp $ +# Maintainer: Angel Velasquez +# Contributor: Stéphane Gaudreault # Contributor: Paul Mattal # Contributor: Jason Chu pkgname=subversion -pkgver=1.7.10 +pkgver=1.8.0 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') @@ -25,17 +26,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 ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ @@ -44,7 +47,7 @@ build() { --enable-javahl --with-gnome-keyring --with-kwallet \ --disable-static - 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 javahl #swig-rb diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 835bc9467..f2cf427a4 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 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') @@ -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 5363d5555..9da959599 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) # Contributor: Jan de Groot # Contributor: M Rawash 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) 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() { -- cgit v1.2.3-54-g00ecf