From 7a65a910b77ad191d69881098c47f9b0c852d92e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Aug 2013 01:33:19 -0700 Subject: Tue Aug 13 01:31:08 PDT 2013 --- extra/digikam/PKGBUILD | 21 ++---- extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz | Bin 402725 -> 0 bytes extra/dvdauthor/PKGBUILD | 4 +- extra/emacs/PKGBUILD | 4 +- extra/gnome-control-center/PKGBUILD | 16 +++-- .../gnome-control-center/no-deprecated-upower.diff | 69 ++++++++++++++++++ ...ogind-to-discover-critical-action-availab.patch | 77 +++++++++++++++++++++ extra/gnome-settings-daemon/PKGBUILD | 15 ++-- extra/imagemagick/PKGBUILD | 17 ++--- extra/inkscape/PKGBUILD | 4 +- extra/msmtp/PKGBUILD | 4 +- extra/obex-data-server/PKGBUILD | 4 +- extra/psiconv/PKGBUILD | 4 +- extra/pstoedit/PKGBUILD | 4 +- extra/qrencode/PKGBUILD | 8 +-- extra/transcode/PKGBUILD | 4 +- extra/vim/PKGBUILD | 8 +-- extra/xf86-video-openchrome/PKGBUILD | 7 +- extra/xine-lib/PKGBUILD | 4 +- 19 files changed, 214 insertions(+), 60 deletions(-) delete mode 100644 extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz create mode 100644 extra/gnome-control-center/no-deprecated-upower.diff create mode 100644 extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch (limited to 'extra') diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index d0ebfd507..5a572a404 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,33 +1,24 @@ -# $Id: PKGBUILD 187093 2013-06-03 17:45:39Z andrea $ +# $Id: PKGBUILD 192477 2013-08-12 20:25:44Z eric $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.0 +pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' - 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' + 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick') -source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "digikam-3.1.0-fixed-pngs.tar.gz") -noextract=("digikam-3.1.0-fixed-pngs.tar.gz") -sha1sums=('666f1d937dc033ddb880aed8a32e7943113d973f' - 'b0a1991e0df9b72c79562c719bc9d944a3b8bc78') +source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ecf8d9eca918059cdd90ef3538295ee9873fb55f') prepare() { mkdir build - - cd ${pkgname}-${pkgver} - - # Fix invalid PNG images to work with libpng 1.6 - # https://bugs.kde.org/show_bug.cgi?id=319350 - tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1 } build() { diff --git a/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz deleted file mode 100644 index cbd21446f..000000000 Binary files a/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz and /dev/null differ diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index 6c03f7184..6a839fc3a 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184370 2013-05-06 19:36:57Z foutrelis $ +# $Id: PKGBUILD 192473 2013-08-12 20:25:40Z eric $ # Maintainer: Giovanni Scafora # Contributor: Travis Willard # Contributor: Jaroslaw Swierczynski @@ -6,7 +6,7 @@ pkgname=dvdauthor pkgver=0.7.1 -pkgrel=5 +pkgrel=6 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64') url="http://dvdauthor.sourceforge.net/" diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 9ed569b3b..327fc41b7 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191914 2013-08-01 06:59:43Z bpiotrowski $ +# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $ # Maintainer: Juergen Hoetzel # Contributor: Renchi Raju pkgname=emacs pkgver=24.3 -pkgrel=3 +pkgrel=4 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 1770b3cad..1266a9f5c 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191381 2013-07-25 09:28:55Z heftig $ +# $Id: PKGBUILD 192485 2013-08-12 21:17:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-control-center pkgver=3.8.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for GNOME" license=(GPL) arch=(i686 x86_64) @@ -22,8 +22,15 @@ groups=(gnome) url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55') +source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz + no-deprecated-upower.diff) +sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55' + '4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../no-deprecated-upower.diff +} build() { cd $pkgname-$pkgver @@ -33,6 +40,7 @@ build() { #https://bugzilla.gnome.org/show_bug.cgi?id=656229 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/extra/gnome-control-center/no-deprecated-upower.diff b/extra/gnome-control-center/no-deprecated-upower.diff new file mode 100644 index 000000000..4fa629855 --- /dev/null +++ b/extra/gnome-control-center/no-deprecated-upower.diff @@ -0,0 +1,69 @@ +diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c +index d70496a..af71db9 100644 +--- c/panels/power/cc-power-panel.c ++++ i/panels/power/cc-power-panel.c +@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate + GCancellable *cancellable; + GtkBuilder *builder; + UpClient *up_client; ++ GDBusProxy *logind_proxy; + GDBusProxy *screen_proxy; + gboolean has_batteries; + +@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object) + } + g_clear_object (&priv->builder); + g_clear_object (&priv->screen_proxy); ++ g_clear_object (&priv->logind_proxy); + g_clear_object (&priv->up_client); + #ifdef HAVE_BLUETOOTH + g_clear_object (&priv->bt_client); +@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self) + GtkWidget *dialog; + GtkWidget *combo; + GtkCellRenderer *cell; ++ GVariant *result; + + /* The default values for these settings are unfortunate for us; + * timeout == 0, action == suspend means 'do nothing' - just +@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self) + gtk_widget_set_margin_bottom (label, 6); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + +- if (up_client_get_can_hibernate (self->priv->up_client)) ++ value = 0; ++ result = g_dbus_proxy_call_sync (self->priv->logind_proxy, ++ "CanHibernate", ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ NULL); ++ if (result) ++ { ++ g_variant_get (result, "(s)", &s); ++ if (g_strcmp0 (s, "yes") == 0) ++ value = 1; ++ g_variant_unref(result); ++ } ++ ++ if (value) + { + model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical"); + priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model); +@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self) + got_screen_proxy_cb, + self); + ++ priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager", ++ NULL, ++ &error); ++ + priv->up_client = up_client_new (); + + priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power"); diff --git a/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch b/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch new file mode 100644 index 000000000..7e678f936 --- /dev/null +++ b/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch @@ -0,0 +1,77 @@ +From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Mon, 5 Aug 2013 18:15:00 +0200 +Subject: [PATCH] power: Use logind to discover critical action availability + +The upower functionality is deprecated and will return an +error unless upower is built with --enable-deprecated. + +Follows a similar patch to gnome-control-center. +--- + plugins/power/gsd-power-manager.c | 42 ++++++++++++++++++++++++++++----------- + 1 file changed, 30 insertions(+), 12 deletions(-) + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index fde90ef..8bd124f 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -27,7 +27,6 @@ + #include + #include + #include +-#define UPOWER_ENABLE_DEPRECATED 1 + #include + #include + #include +@@ -1164,18 +1163,37 @@ static GsdPowerActionType + manager_critical_action_get (GsdPowerManager *manager, + gboolean is_ups) + { +- GsdPowerActionType policy; ++ GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN; ++ GsdPowerActionType setpolicy; ++ GVariant *result = NULL; ++ gchar *s; + +- policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); +- if (policy == GSD_POWER_ACTION_SUSPEND) { +- if (is_ups == FALSE && +- up_client_get_can_suspend (manager->priv->up_client)) +- return policy; +- return GSD_POWER_ACTION_SHUTDOWN; +- } else if (policy == GSD_POWER_ACTION_HIBERNATE) { +- if (up_client_get_can_hibernate (manager->priv->up_client)) +- return policy; +- return GSD_POWER_ACTION_SHUTDOWN; ++ setpolicy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); ++ ++ if (setpolicy == GSD_POWER_ACTION_SUSPEND) { ++ if (is_ups == FALSE) { ++ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, ++ "CanSuspend", ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, NULL, NULL); ++ } ++ } else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) { ++ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, ++ "CanHibernate", ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, NULL, NULL); ++ } else { ++ /* Other actions need no check */ ++ return setpolicy; ++ } ++ ++ if (result) { ++ g_variant_get (result, "(s)", &s); ++ if (g_strcmp0 (s, "yes") == 0) ++ policy = setpolicy; ++ g_variant_unref (result); + } + + return policy; +-- +1.8.3.4 + diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 4cc694531..c2a375b44 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191201 2013-07-19 20:57:52Z heftig $ +# $Id: PKGBUILD 192484 2013-08-12 21:17:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-settings-daemon pkgver=3.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -14,8 +14,15 @@ 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=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 0001-power-Use-logind-to-discover-critical-action-availab.patch) +sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc' + '9825d3486665d87d4fc54355a6d318d68f5d3caeb286bdd659147920a85c56d9') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../0001-power-Use-logind-to-discover-critical-action-availab.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 2209368ee..e132635fa 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 189934 2013-07-11 19:07:10Z eric $ +# $Id: PKGBUILD 192475 2013-08-12 20:25:42Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.6.4 +pkgver=6.8.6.8 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \ - 'opencl-headers' 'libcl') + 'opencl-headers' 'libcl' 'libwebp') #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('ab62d1777ef3ae18820bdb9f757ac65f9d2f944d' +sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { @@ -27,11 +27,11 @@ prepare() { build() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ --enable-opencl --without-gvc --without-djvu --without-autotrace \ - --without-webp --without-jbig --without-fpx --without-dps --without-fftw + --without-jbig --without-fpx --without-dps --without-fftw make } @@ -49,7 +49,8 @@ package_imagemagick() { 'librsvg: for SVG support' 'libxml2: for XML support' 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') + 'libpng: for PNG support' + 'libwebp: for WEBP support') backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml" "etc/ImageMagick-${pkgver%%.*}/colors.xml" "etc/ImageMagick-${pkgver%%.*}/delegates.xml" diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index cf7f9f5e4..86d71efa7 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 192062 2013-08-05 14:17:31Z andyrtr $ +# $Id: PKGBUILD 192476 2013-08-12 20:25:43Z eric $ # Maintainer: Gaetan Bisson # Contributor: Tobias Kieslich # Contributor: tobias pkgname=inkscape pkgver=0.48.4 -pkgrel=9 +pkgrel=10 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 134fab5cd..095539f20 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187066 2013-06-03 11:16:46Z allan $ +# $Id: PKGBUILD 192440 2013-08-11 23:21:00Z eric $ # Maintainer: Eric Bélanger pkgbase=msmtp @@ -8,7 +8,7 @@ pkgrel=4 arch=('i686' 'x86_64') license=('GPL3') url="http://msmtp.sourceforge.net" -makedepends=('texlive-core' 'gsasl' 'libgnome-keyring') +makedepends=('texlive-plainextra' 'gsasl' 'libgnome-keyring') source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2) sha1sums=('c0edce1e1951968853f15209c8509699ff9e9ab5') diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index c290417cc..ae9838362 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187105 2013-06-03 20:13:14Z andrea $ +# $Id: PKGBUILD 192478 2013-08-12 20:25:45Z eric $ # Maintainer: Andrea Scarpino # Contributor: Geoffroy Carrier # Contributor: Roman Kyrylych @@ -6,7 +6,7 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=7 +pkgrel=8 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index 294a87dd5..2a5fd3575 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180313 2013-03-20 02:35:34Z eric $ +# $Id: PKGBUILD 192479 2013-08-12 20:25:46Z eric $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=psiconv pkgver=0.9.8 -pkgrel=12 +pkgrel=13 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64') url="http://software.frodo.looijaard.name/psiconv/" diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 4d7940817..7612f88fe 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191859 2013-07-31 16:31:30Z bpiotrowski $ +# $Id: PKGBUILD 192480 2013-08-12 20:25:47Z eric $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Tobias Powalowski pkgname=pstoedit pkgver=3.62 -pkgrel=1 +pkgrel=2 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=('i686' 'x86_64') url="http://www.pstoedit.net/" diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index f94013227..6c6f2e790 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184425 2013-05-06 19:39:20Z foutrelis $ +# $Id: PKGBUILD 192463 2013-08-12 10:26:17Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau pkgname=qrencode -pkgver=3.4.2 -pkgrel=2 +pkgver=3.4.3 +pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64) depends=('libpng') @@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2c1693a29fe2f26089ccdff9051c0a3f') +md5sums=('89a90a3b8cbca60ac412b2e0e0c776e7') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index a5d25bb6c..eb2219d56 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191909 2013-08-01 06:53:42Z bpiotrowski $ +# $Id: PKGBUILD 192481 2013-08-12 20:25:48Z eric $ # Maintainer: # Contributor: Sarah Hay # Contributor: roberto @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=10 +pkgrel=11 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 7529981e8..2e4e5af7f 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -5,9 +5,9 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') -_topver=7.3 -_patchlevel=1287 -__hgrev=941318315ace +_topver=7.4 +_patchlevel=0 +__hgrev=a643d80b6507 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -20,7 +20,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('e43d2b39c51246ad8dba45d0d75748ec' +md5sums=('1dfdea2e3fbf778647286d7e23ef9f54' 'SKIP' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 5d38408b6..a287258bd 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 186307 2013-05-24 13:57:21Z andyrtr $ +# $Id: PKGBUILD 192461 2013-08-12 09:17:15Z lcarlier $ # Contributor: Paul Mattal # Maintainer: Juergen Hoetzel pkgname=xf86-video-openchrome pkgver=0.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) license=('custom') url="http://www.openchrome.org" depends=('libdrm' 'libxvmc' 'systemd') +optdepends=('unichrome-dri') makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri') +conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome') replaces=('openchrome' 'xf86-video-via') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 360da766d..672d34a2e 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191912 2013-08-01 06:53:45Z bpiotrowski $ +# $Id: PKGBUILD 192482 2013-08-12 20:25:49Z eric $ # Maintainer: Eric Bélanger pkgname=xine-lib pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" -- cgit v1.2.3-54-g00ecf