From 8867b1d4d0601b21618d44d015460739590ca01d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 May 2011 22:34:26 +0000 Subject: Wed May 11 22:34:25 UTC 2011 --- extra/amule/PKGBUILD | 6 +-- extra/apache/PKGBUILD | 4 +- extra/apr-util/PKGBUILD | 10 ++--- extra/apr/PKGBUILD | 6 +-- extra/dconf/PKGBUILD | 14 +++---- extra/dconf/dconf.install | 1 + extra/evince/PKGBUILD | 16 +++++--- extra/evince/introspection-fix.patch | 11 ++++++ extra/glibmm/PKGBUILD | 8 ++-- extra/gnome-desktop/PKGBUILD | 13 +++++-- extra/gnome-desktop/randr-fix.patch | 26 +++++++++++++ ...1-Don-t-crash-when-removing-nameless-user.patch | 31 +++++++++++++++ extra/gnome-shell/PKGBUILD | 11 ++++-- extra/gtkmm3/PKGBUILD | 6 +-- extra/libnotify/PKGBUILD | 6 +-- extra/lm_sensors/PKGBUILD | 14 ++++--- ...ors_trunk_prog_detect_sensors-detect_r5964.diff | 44 ++++++++++++++++++++++ extra/telepathy-logger/PKGBUILD | 6 +-- extra/telepathy-mission-control/PKGBUILD | 6 +-- extra/tomcat-native/PKGBUILD | 4 +- 20 files changed, 185 insertions(+), 58 deletions(-) create mode 100644 extra/evince/introspection-fix.patch create mode 100644 extra/gnome-desktop/randr-fix.patch create mode 100644 extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch create mode 100644 extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff (limited to 'extra') diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index dbeee3c53..724a4f824 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120058 2011-04-18 22:46:19Z giovanni $ +# $Id: PKGBUILD 123337 2011-05-10 13:19:54Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Henrik Ronellenfitsch # Contributor: Alessio Sergi # Contributor: Dario 'Dax' Vilardi pkgname=amule -pkgver=10525 +pkgver=10552 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('d1b925a2ceac1c63b5fb1e42702c1a2a') +md5sums=('b3685a792e92c2900dbb3eaeba7cc65d') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index ab87adbbb..41b26cd97 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123237 2011-05-09 13:25:58Z jgc $ +# $Id: PKGBUILD 123392 2011-05-10 21:15:00Z foutrelis $ # Maintainer: Jan de Groot # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=apache pkgver=2.2.17 -pkgrel=2 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 2ea584661..c40bdaf6c 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96364 2010-10-20 01:39:57Z allan $ +# $Id: PKGBUILD 123397 2011-05-10 22:24:40Z foutrelis $ # Maintainer: Jan de Groot # Maintainer: Pierre Schmitz pkgname=apr-util -pkgver=1.3.10 -pkgrel=2 +pkgver=1.3.11 +pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" -depends=('apr>=1.4.2' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') +depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('6a6f501a1b2a45166b8ffd6df29204bb') +md5sums=('2aeddb384b03f3f73107770724d5c97b') build() { cd "${srcdir}/apr-util-${pkgver}" diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index b0d3f4d96..4bd4ae012 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72235 2010-03-13 20:22:25Z jgc $ +# $Id: PKGBUILD 123387 2011-05-10 21:11:03Z foutrelis $ # Maintainer: Jan de Groot # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=apr -pkgver=1.4.2 +pkgver=1.4.4 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('util-linux-ng>=2.16') options=('!libtool') license=('APACHE') source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2) -md5sums=('4b00e8f70c067893d075577962656b35') +md5sums=('daf5487c82dd7bec9c005c96f8cb01b1') build() { cd "${srcdir}/apr-${pkgver}" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index e0d1b48a0..d9054bb6d 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123094 2011-05-08 12:20:20Z ibiru $ +# $Id: PKGBUILD 123352 2011-05-10 15:42:26Z ibiru $ # Maintainer: Ionut Biru pkgname=dconf -pkgver=0.7.4 -pkgrel=2 +pkgver=0.7.5 +pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) url="http://live.gnome.org/dconf" @@ -11,16 +11,12 @@ depends=('glib2') makedepends=('vala' 'gobject-introspection' 'gtk3') optdepends=('gtk3: for dconf-editor') install=dconf.install -source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2 - fix-crash-when-user-database-is-not-present.patch) -sha256sums=('299d79daf0b214c692e7d5788d7bda76d778c1748ea37c33256c4fa6143b22cd' - 'c78ea8db69a1be1286846282897f99e843e14d1e450beee4339d5500b2f0f73d') +source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-crash-when-user-database-is-not-present.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/dconf make diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install index 5a87df82f..39bce8f45 100644 --- a/extra/dconf/dconf.install +++ b/extra/dconf/dconf.install @@ -1,5 +1,6 @@ post_install() { usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas } post_upgrade(){ diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 217a1a3e1..25e577816 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121987 2011-05-01 07:40:14Z ibiru $ +# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $ # Maintainer: Jan de Groot pkgname=evince pkgver=3.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') @@ -15,19 +15,25 @@ optdepends=('texlive-bin: DVI support') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + introspection-fix.patch) +sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b' + '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/introspection-fix.patch" + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/evince \ --disable-static --enable-nautilus \ --enable-pdf --enable-tiff \ --enable-djvu --enable-dvi \ --enable-t1lib --enable-comics \ - --disable-scrollkeeper --disable-schemas-compile + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection make } diff --git a/extra/evince/introspection-fix.patch b/extra/evince/introspection-fix.patch new file mode 100644 index 000000000..6a64517bd --- /dev/null +++ b/extra/evince/introspection-fix.patch @@ -0,0 +1,11 @@ +diff a/libview/Makefile.am b/libview/Makefile.am +--- a/libview/Makefile.am ++++ b/libview/Makefile.am +@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte + --output $@ \ + --pkg evince-document-$(EV_API_VERSION) \ + --pkg evince-view-$(EV_API_VERSION) \ ++ -L$(top_builddir)/libdocument/ \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DEVINCE_COMPILATION \ diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 989a02410..dbcf18034 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 118216 2011-04-05 22:43:03Z heftig $ +# $Id: PKGBUILD 123377 2011-05-10 16:36:13Z ibiru $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.28.0 -pkgrel=2 +pkgver=2.28.1 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') makedepends=('glib2' 'libsigc++2.0' 'pkgconfig' 'mm-common') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('b1b99868896b028354141e3b2470d98799283e90154550e12614f692db17a5a3') +sha256sums=('ca74638b91296df127caab30f2d0664746bfefa942ce5a5ecc982e0f16edc145') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index c393fcc30..78ff8869b 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120873 2011-04-26 21:57:00Z ibiru $ +# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $ # Maintainer: Jan de Groot pkgname=gnome-desktop pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -12,11 +12,16 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + randr-fix.patch) +sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3' + '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/randr-fix.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --with-gnome-distributor="Arch Linux" \ diff --git a/extra/gnome-desktop/randr-fix.patch b/extra/gnome-desktop/randr-fix.patch new file mode 100644 index 000000000..c5d83ef2c --- /dev/null +++ b/extra/gnome-desktop/randr-fix.patch @@ -0,0 +1,26 @@ +From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sun, 01 May 2011 00:48:03 +0000 +Subject: Don't fall over if RANDR is missing + +When RANDR is not present, the screen object never gets an info, +and since screen_info_free asserts, we must not call it unconditionally +in finalize. +This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053 +--- +diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c +index 4a9d98e..eb3d735 100644 +--- a/libgnome-desktop/gnome-rr.c ++++ b/libgnome-desktop/gnome-rr.c +@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject) + + gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen); + +- screen_info_free (screen->priv->info); ++ if (screen->priv->info) ++ screen_info_free (screen->priv->info); + + G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject); + } +-- +cgit v0.9 diff --git a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch new file mode 100644 index 000000000..c07627338 --- /dev/null +++ b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch @@ -0,0 +1,31 @@ +From 8977ba4f23aef8754c0a912e7e1ec46f8da4776e Mon Sep 17 00:00:00 2001 +From: Ionut Biru +Date: Mon, 9 May 2011 13:03:17 -0700 +Subject: [PATCH] Don't crash when removing nameless user + +Fixes https://bugzilla.gnome.org/show_bug.cgi?id=647893 + +Signed-off-by: Ionut Biru +--- + src/gdmuser/gdm-user-manager.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c +index eba9da1..543fcc3 100644 +--- a/src/gdmuser/gdm-user-manager.c ++++ b/src/gdmuser/gdm-user-manager.c +@@ -777,7 +777,10 @@ remove_user (GdmUserManager *manager, + if (gdm_user_get_object_path (user) != NULL) { + g_hash_table_remove (manager->priv->users_by_object_path, gdm_user_get_object_path (user)); + } +- g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user)); ++ ++ if (gdm_user_get_user_name (user) != NULL) { ++ g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user)); ++ } + + if (manager->priv->is_loaded) { + g_signal_emit (manager, signals[USER_REMOVED], 0, user); +-- +1.7.5.1 + diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 55bf202d5..e1f13a17a 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122711 2011-05-06 07:06:52Z ibiru $ +# $Id: PKGBUILD 123342 2011-05-10 13:48:13Z ibiru $ # Maintainer: Ionut Biru # Contributor: Flamelab pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.0/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('567582948d4c47c29aa751162adc714644f50958d3d3e427c7a8c3818cd643f9') +sha256sums=('fb2d982095919e58ab5757042bf72e2a6243e77825c8ae6f46c41ab66cb68498') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD index f20fb9f0a..571001868 100644 --- a/extra/libnotify/PKGBUILD +++ b/extra/libnotify/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115920 2011-03-22 14:03:02Z ibiru $ +# $Id: PKGBUILD 123347 2011-05-10 13:55:24Z ibiru $ # Maintainer: Jan de Groot pkgname=libnotify -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Desktop notification library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gdk-pixbuf2') makedepends=('gtk3' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9b6a8459401e4af3da9cbc9e35a58d1a977273d3fe898d4a00a888f4191b85d6') +sha256sums=('322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 4e08276b3..fa90cc256 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122622 2011-05-05 07:25:15Z eric $ +# $Id: PKGBUILD 123402 2011-05-11 03:51:18Z eric $ # Maintainer: Eric Bélanger pkgname=lm_sensors pkgver=3.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -15,7 +15,8 @@ backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \ - sensord.conf sensord.rc daemonarg.patch) + sensord.conf sensord.rc daemonarg.patch \ + changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff) md5sums=('5eb18d7531ead4f54f28a1133a606535' 'c370f5e620bfe41113354a1e22c0c18c' '232bedf043dd5dedde82df1a399c682c' @@ -25,7 +26,8 @@ md5sums=('5eb18d7531ead4f54f28a1133a606535' '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7' '41a5c20854bbff00ea7174bd2276b736' - '40c8eb16af8249a0f1d851fc1057ea15') + '40c8eb16af8249a0f1d851fc1057ea15' + '2f1c004bd525bdc9b2495503a77d375a') sha1sums=('16c13a186557164fa51459a02209b120c0335f96' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' 'a068ac0a3115a6191a487e11422506baa922b40a' @@ -35,12 +37,14 @@ sha1sums=('16c13a186557164fa51459a02209b120c0335f96' 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' '72a60251d1d55a67307dab4105d9f3f01a080af4' - '34241388c4001bfb6e49b7e10da1217e29a258d6') + '34241388c4001bfb6e49b7e10da1217e29a258d6' + '0de66445805adaf65935764da9974df1db125865') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 < ../sensors-detect.patch patch -p1 < ../daemonarg.patch + patch -p2 < ../changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff make PREFIX=/usr } diff --git a/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff new file mode 100644 index 000000000..eb3c591b9 --- /dev/null +++ b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff @@ -0,0 +1,44 @@ +Index: lm-sensors/trunk/prog/detect/sensors-detect +=================================================================== +--- lm-sensors/trunk/prog/detect/sensors-detect (revision 5963) ++++ lm-sensors/trunk/prog/detect/sensors-detect (revision 5964) +@@ -2416,5 +2416,5 @@ + # Try some known default udev db locations, just in case + if (-e '/dev/.udev.tdb' || -e '/dev/.udev' +- || -e '/dev/.udevdb') { ++ || -e '/dev/.udevdb' || -e '/run/udev') { + $use_udev = 1; + $dev_i2c = '/dev/i2c-'; +@@ -6460,4 +6460,20 @@ + close(SYSCONFIG); + ++ if (-x "/bin/systemctl" && -d "/lib/systemd/system" && ++ ! -f "/lib/systemd/system/lm_sensors.service") { ++ print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n". ++ "and run 'systemctl enable lm_sensors.service'\n". ++ "for initialization at boot time.\n"; ++ return; ++ } ++ ++ if (-x "/bin/systemctl" && ++ -f "/lib/systemd/system/lm_sensors.service") { ++ system("/bin/systemctl", "enable", "lm_sensors.service"); ++ system("/bin/systemctl", "start", "lm_sensors.service"); ++ # All done, don't check for /etc/init.d/lm_sensors ++ return; ++ } ++ + print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". + "for initialization at boot time.\n" +@@ -6513,7 +6497,9 @@ + exit -1; + } + +- if (-x "/sbin/service" && -f "/etc/rc.d/sensors" && +- -f "/var/lock/subsys/lm_sensors") { ++ if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") { ++ system("/bin/systemctl", "stop", "lm_sensors.service"); ++ } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" && ++ -f "/var/lock/subsys/lm_sensors") { + system("/sbin/service", "lm_sensors", "stop"); + } diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD index 7e0e7f1bd..74857964b 100644 --- a/extra/telepathy-logger/PKGBUILD +++ b/extra/telepathy-logger/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117598 2011-04-04 12:33:45Z ibiru $ +# $Id: PKGBUILD 123372 2011-05-10 16:32:52Z ibiru $ # Maintainer: Ionut Biru pkgname=telepathy-logger -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=1 pkgdesc="Telepathy framework logging daemon" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('755e6dcaa6a9ccf47f2fe73f3d4d888b') +md5sums=('6d4a1c916883e4d1f19ed1002be6700c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 1b086ce5f..01b065caa 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120802 2011-04-26 15:50:07Z ibiru $ +# $Id: PKGBUILD 123367 2011-05-10 16:31:02Z ibiru $ # Maintainer: Ionut Biru # Contributor: Ju Liu # Contributor: Bjorn Lindeijer # Contributor: Andreas Zwinkau pkgname=telepathy-mission-control -pkgver=5.7.9 +pkgver=5.7.10 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('df7e63d857676fab9ec2261cffe5eb4a') +md5sums=('2793b7502c9a88dd1c7468c684bb7a5f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 8572c26fc..3686445e1 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -3,12 +3,12 @@ pkgname=tomcat-native pkgver=1.1.20 -pkgrel=1 +pkgrel=2 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64') url="http://tomcat.apache.org/" license="Apache" -depends=('tomcat' 'apr' 'openssl') +depends=('apr' 'openssl') makedepends=('java-environment') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) md5sums=('fb2b9d073cb6575c2d0020eda266ca0c') -- cgit v1.2.3-54-g00ecf