From cd3e25625999a62fa1c10e233f371a30d03f67c8 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Dec 2012 02:08:07 -0800 Subject: Mon Dec 3 02:06:13 PST 2012 --- extra/enlightenment17/PKGBUILD | 8 +-- extra/glew/PKGBUILD | 17 ++++-- extra/glew/glxew_export_fix.diff | 30 ++++++++++ extra/libsocialweb/PKGBUILD | 13 +++-- extra/libsocialweb/libsocialweb-gir-fix.patch | 82 +++++++++++++++++++++++++++ extra/live-media/PKGBUILD | 6 +- 6 files changed, 139 insertions(+), 17 deletions(-) create mode 100644 extra/glew/glxew_export_fix.diff create mode 100644 extra/libsocialweb/libsocialweb-gir-fix.patch (limited to 'extra') diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 5d9a31ee1..843a6af5b 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172084 2012-11-27 19:02:07Z ronald $ +# $Id: PKGBUILD 172451 2012-12-02 20:54:27Z ronald $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0alpha6 -_pkgver=0.17.0-alpha6 +pkgver=0.17.0alpha7 +_pkgver=0.17.0-alpha7 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('52d44b95a9fd2f4e9033ac65a4fd9ebcac70b9b0' +sha1sums=('97ed2c936e6fa2385658f876a4099a029df43787' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index bb4cde357..95d564082 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,20 +1,27 @@ -# $Id: PKGBUILD 169747 2012-10-27 23:41:49Z eric $ -# Maintainer: Stéphane Gaudreault +# $Id: PKGBUILD 172301 2012-12-02 09:47:22Z andyrtr $ +# Maintainer: Andreas Radke +# Contributor: Stéphane Gaudreault # Contributor: SleepyDog pkgname=glew pkgver=1.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'glu') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz + glxew_export_fix.diff) +sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe' + 'f389645a1400aebdadce596fec970cfe0be6c15b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # fix compilation for some 3rd party apps; FS#32835 + patch -Np1 -i ${srcdir}/glxew_export_fix.diff + sed -i 's|lib64|lib|' config/Makefile.linux make } diff --git a/extra/glew/glxew_export_fix.diff b/extra/glew/glxew_export_fix.diff new file mode 100644 index 000000000..8a179e0a7 --- /dev/null +++ b/extra/glew/glxew_export_fix.diff @@ -0,0 +1,30 @@ +X-Git-Url: +http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew%2Fglew;a=blobdiff_plain;f=auto%2Fsrc%2Fglxew_mid.h;h=e9a3391acefafcc1b2979d2cfad1d43c602521c1;hp=cfcd20d472a790f461e01e6e20a570582452236c;hb=6d14805de58321e8a7b1881323e604bb0ba27217;hpb=38a3d857549e7ac31b7edb2a1cfa1ead52f72220 + +diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h +index cfcd20d..e9a3391 100644 +--- a/auto/src/glxew_mid.h ++++ b/auto/src/glxew_mid.h +@@ -1,7 +1,7 @@ + /* ------------------------------------------------------------------------- */ + + #ifdef GLEW_MX +-#define GLXEW_FUN_EXPORT ++#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT + #define GLXEW_VAR_EXPORT + #else + #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT +Index: glew-1.8.0/include/GL/glxew.h +=================================================================== +--- glew-1.8.0.orig/include/GL/glxew.h 2012-08-08 20:56:17.574088414 +0200 ++++ glew-1.8.0/include/GL/glxew.h 2012-08-08 20:57:34.350092129 +0200 +@@ -1360,7 +1360,7 @@ + /* ------------------------------------------------------------------------- */ + + #ifdef GLEW_MX +-#define GLXEW_FUN_EXPORT ++#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT + #define GLXEW_VAR_EXPORT + #else + #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT + diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD index 31cf02778..74fd559f9 100644 --- a/extra/libsocialweb/PKGBUILD +++ b/extra/libsocialweb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156918 2012-04-23 09:09:02Z ibiru $ +# $Id: PKGBUILD 172299 2012-12-02 08:28:48Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libsocialweb -pkgver=0.25.20 +pkgver=0.25.21 pkgrel=1 pkgdesc="A personal social data server" arch=('i686' 'x86_64') @@ -12,11 +12,14 @@ depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring' 'json-glib' 'networkmanager') makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection') options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + libsocialweb-gir-fix.patch) +sha256sums=('f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687' + 'fec8d2c67c62618b89dca238ebe502c6525d42987625b6d87dd704f88219a46a') build() { cd $pkgname-$pkgver + patch -Np1 -i ../libsocialweb-gir-fix.patch ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -29,7 +32,7 @@ build() { package() { cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/libsocialweb/libsocialweb-gir-fix.patch b/extra/libsocialweb/libsocialweb-gir-fix.patch new file mode 100644 index 000000000..23fc0f535 --- /dev/null +++ b/extra/libsocialweb/libsocialweb-gir-fix.patch @@ -0,0 +1,82 @@ +From c1791e96182815449781fcda6007b69cd88cf7bf Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 04 Jun 2012 17:54:12 +0000 +Subject: client: Fix namespacing of introspection annotations + +--- +diff --git a/libsocialweb-client/sw-client-contact-view.c b/libsocialweb-client/sw-client-contact-view.c +index bb2679f..6eaee0e 100644 +--- a/libsocialweb-client/sw-client-contact-view.c ++++ b/libsocialweb-client/sw-client-contact-view.c +@@ -384,7 +384,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass) + /** + * SwClientContactView::contacts-added: + * @self: +- * @contacts: (type GLib.List) (element-type Sw.Contact): ++ * @contacts: (type GLib.List) (element-type SocialWebClient.Contact): + */ + signals[CONTACTS_ADDED_SIGNAL] = + g_signal_new ("contacts-added", +@@ -401,7 +401,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass) + /** + * SwClientContactView::contacts-removed: + * @self: +- * @contacts: (type GLib.List) (element-type Sw.Contact): ++ * @contacts: (type GLib.List) (element-type SocialWebClient.Contact): + */ + signals[CONTACTS_REMOVED_SIGNAL] = + g_signal_new ("contacts-removed", +@@ -418,7 +418,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass) + /** + * SwClientContactView::contacts-changed: + * @self: +- * @contacts: (type GLib.List) (element-type Sw.Contact): ++ * @contacts: (type GLib.List) (element-type SocialWebClient.Contact): + */ + signals[CONTACTS_CHANGED_SIGNAL] = + g_signal_new ("contacts-changed", +diff --git a/libsocialweb-client/sw-client-item-view.c b/libsocialweb-client/sw-client-item-view.c +index 6bfdb76..ab98fdd 100644 +--- a/libsocialweb-client/sw-client-item-view.c ++++ b/libsocialweb-client/sw-client-item-view.c +@@ -389,7 +389,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass) + /** + * SwClientItemView::items-added: + * @self: +- * @items: (type GLib.List) (element-type Sw.Item): ++ * @items: (type GLib.List) (element-type SocialWebClient.Item): + */ + signals[ITEMS_ADDED_SIGNAL] = + g_signal_new ("items-added", +@@ -406,7 +406,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass) + /** + * SwClientItemView::items-removed: + * @self: +- * @items: (type GLib.List) (element-type Sw.Item): ++ * @items: (type GLib.List) (element-type SocialWebClient.Item): + */ + signals[ITEMS_REMOVED_SIGNAL] = + g_signal_new ("items-removed", +@@ -423,7 +423,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass) + /** + * SwClientItemView::items-changed: + * @self: +- * @items: (type GLib.List) (element-type Sw.Item): ++ * @items: (type GLib.List) (element-type SocialWebClient.Item): + */ + signals[ITEMS_CHANGED_SIGNAL] = + g_signal_new ("items-changed", +diff --git a/libsocialweb-client/sw-contact.c b/libsocialweb-client/sw-contact.c +index efefb37..b56ab39 100644 +--- a/libsocialweb-client/sw-contact.c ++++ b/libsocialweb-client/sw-contact.c +@@ -104,7 +104,6 @@ sw_contact_get_value (SwContact *contact, + + /** + * sw_contact_get_value_all: +- * + * @contact: : + * @key: : + * +-- +cgit v0.9.0.2 diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 5dbbb01c4..e196c147a 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172118 2012-11-29 17:09:42Z giovanni $ +# $Id: PKGBUILD 172224 2012-12-02 07:43:42Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2012.11.29 +pkgver=2012.11.30 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('42000c39b2a9beadef1f1a641897f61f') +md5sums=('959941def0dfb7bc795fddcc5175ed9a') build() { cd ${srcdir}/live -- cgit v1.2.3-54-g00ecf