From 733e4f771063834ef4d8f31af1dcac95d55e3c3e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 15 Jan 2013 00:06:27 -0800 Subject: Tue Jan 15 00:06:26 PST 2013 --- extra/appmenu-qt/PKGBUILD | 6 ++-- extra/appmenu-qt/appmenu-async.diff | 28 +++++++++++++++ extra/dmapi/PKGBUILD | 8 ++--- extra/git/PKGBUILD | 15 ++++----- extra/gtkpod/PKGBUILD | 14 ++++---- extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch | 44 ++++++++++++++++++++++++ extra/llvm/PKGBUILD | 9 +++-- extra/tumbler/PKGBUILD | 12 +++---- extra/w3m/PKGBUILD | 19 +++++++---- extra/w3m/file_handle.patch | 60 +++++++++++++++++++++++++++++++++ extra/w3m/gc72.patch | 13 +++++++ extra/w3m/https.patch | 19 +++++++++++ 12 files changed, 208 insertions(+), 39 deletions(-) create mode 100644 extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch create mode 100644 extra/w3m/file_handle.patch create mode 100644 extra/w3m/gc72.patch create mode 100644 extra/w3m/https.patch (limited to 'extra') diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD index 27e1208bf..64deb879b 100644 --- a/extra/appmenu-qt/PKGBUILD +++ b/extra/appmenu-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174631 2013-01-05 12:47:25Z andrea $ +# $Id: PKGBUILD 175130 2013-01-14 17:12:42Z andrea $ # Maintainer: Andrea Scarpino pkgname=appmenu-qt pkgver=0.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet" arch=('i686' 'x86_64') url='https://launchpad.net/appmenu-qt' @@ -14,7 +14,7 @@ source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${ 'appmenu-async.diff') md5sums=('90cce750e5412d43ce075b0a9bdb6782' 'de499d01369fc85040f5bbfc53ae1700' - '82947207881702d88403c149406b502a') + '5db00ca92274c8b1797c204321961189') build() { # FS#33286 diff --git a/extra/appmenu-qt/appmenu-async.diff b/extra/appmenu-qt/appmenu-async.diff index c4bc509d7..59e3ce791 100644 --- a/extra/appmenu-qt/appmenu-async.diff +++ b/extra/appmenu-qt/appmenu-async.diff @@ -119,3 +119,31 @@ + + +=== modified file 'src/appmenuplatformmenubar.cpp' +--- src/appmenuplatformmenubar.cpp 2013-01-11 15:05:38 +0000 ++++ src/appmenuplatformmenubar.cpp 2013-01-14 16:01:25 +0000 +@@ -410,6 +410,10 @@ + registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, QDBusConnection::sessionBus(), 0); + } + ++ if (!registrar || !registrar->isValid()) { ++ return false; ++ } ++ + Q_FOREACH(QAction *action, m_menuBar->actions()) { + if (!action->isSeparator()) { + m_rootMenu->addAction(action); +@@ -430,9 +434,9 @@ + } + + m_registeredWinId = winId; +- if (registrar) { +- registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); +- } ++ ++ registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); ++ + return true; + } + + diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD index ada627216..3e47d8053 100644 --- a/extra/dmapi/PKGBUILD +++ b/extra/dmapi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137722 2011-09-10 14:14:07Z pierre $ +# $Id: PKGBUILD 175121 2013-01-14 07:38:26Z tpowa $ # Maintainer: Tobias Powalowski pkgname=dmapi -pkgver=2.2.10 -pkgrel=3 +pkgver=2.2.12 +pkgrel=1 pkgdesc="Data migration API" arch=('i686' 'x86_64') url="http://oss.sgi.com/projects/xfs/" @@ -15,7 +15,6 @@ conflicts=('xfsdmapi') replaces=('xfsdmapi') options=('!libtool') source=("ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz") -md5sums=('c6e4ace10c446bbb92576e5dd19aec24') build() { cd $srcdir/dmapi-$pkgver @@ -38,3 +37,4 @@ package() { # kill libexec dir rm -rf $pkgdir/usr/libexec } +md5sums=('cd825d4e141c16011367e0a0dd98c9c5') diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index e8de55002..8ea4c7e09 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174135 2013-01-02 14:21:11Z dan $ +# $Id: PKGBUILD 175132 2013-01-14 22:24:03Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.1 +pkgver=1.8.1.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -28,13 +28,11 @@ source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" git-daemon git-daemon.conf git-daemon@.service - git-daemon.socket - fix-git-build-python.patch) + git-daemon.socket) build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" - patch -Np1 < ../fix-git-build-python.patch make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -111,10 +109,9 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('a2c6f4404c5e432b47474d246ca83c7e' - '8da825142aed9f37f80ad67164990373' +md5sums=('2bf7fd005ecf2e0a311b849e6add7994' + '4ac4ea5a72ec96ac24b7d6fba9ad1277' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' - 'f67869315c2cc112e076f0c73f248002' - '7fd505fdcd0cd0223e5b8ad641090de8') + 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 717c6c763..8ff8d4cf6 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170131 2012-11-03 12:34:41Z ibiru $ +# $Id: PKGBUILD 175123 2013-01-14 08:37:19Z eric $ # Contributor: Kevin Piche # Contributor: Aaron Griffin pkgname=gtkpod -pkgver=2.1.2 -pkgrel=4 +pkgver=2.1.3 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" @@ -19,13 +19,13 @@ optdepends=('libmp4v2: MP4/h264 support' install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz" - "gtkpod-2.1.2-anjuta.patch") -md5sums=('88fef3f947cbb7ae6b714080733a3b6b' - '0a5f4ce0c9ef3d4d8db57290df43db27') + gtkpod-2.1.3-gdl-3.6.patch) +md5sums=('57f04578de6e3262a436ec574422b144' + '8d725015081bd89bc8f9a4521d170aef') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch" + patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch" sed -i 's#python#python2#' scripts/sync-palm-jppy.py ./configure --prefix=/usr make diff --git a/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch new file mode 100644 index 000000000..b794fa11b --- /dev/null +++ b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch @@ -0,0 +1,44 @@ +Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c +=================================================================== +--- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c ++++ gtkpod-2.1.2/src/anjuta-action-callbacks.c +@@ -65,7 +65,7 @@ void + on_layout_lock_toggle (GtkAction *action, AnjutaApp *app) + { + if (app->layout_manager) +- g_object_set (app->layout_manager->master, "locked", ++ g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked", + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), + NULL); + } +Index: gtkpod-2.1.2/src/anjuta-app.c +=================================================================== +--- gtkpod-2.1.2.orig/src/anjuta-app.c ++++ gtkpod-2.1.2/src/anjuta-app.c +@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin + else if (g_strcmp0(pr_style, "Tabs") == 0) + style = GDL_SWITCHER_STYLE_TABS; + +- g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL); ++ g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL); + g_free(pr_style); + } + +@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj + gtk_widget_show(app->dock); + gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0); + +- dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock)); ++ dockbar = gdl_dock_bar_new(G_OBJECT(app->dock)); + gtk_widget_show(dockbar); + gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); + +- app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock)); ++ app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock)); + g_signal_connect (app->layout_manager, "notify::dirty", + G_CALLBACK (on_layout_dirty_notify), app); +- g_signal_connect (app->layout_manager->master, "notify::locked", ++ g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked", + G_CALLBACK (on_layout_locked_notify), app); + + /* UI engine */ diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index dee9a46c5..f4be669a3 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173988 2012-12-31 11:59:46Z foutrelis $ +# $Id: PKGBUILD 175116 2013-01-14 06:46:10Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Jan "heftig" Steffens # Contributor: Sebastian Nowicki @@ -11,7 +11,7 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=3.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') @@ -26,7 +26,7 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz enable-lto.patch llvm-3.1-fix-debug-line-info.patch clang-3.1-fix-libprofile_rt.a-location.patch) -sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343' +sha256sums=('378f9ed7126409785aa399bf367762753dbda563b60612dae1a92d5263ab8130' '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658' 'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' @@ -228,6 +228,9 @@ package_clang-analyzer() { ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" done + # scan-build looks for clang within the same directory + ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/" + # Relocate man page install -d "$pkgdir/usr/share/man/man1" mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \ diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 85d5c6323..2a2d91938 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 175094 2013-01-13 14:57:05Z foutrelis $ +# $Id: PKGBUILD 175134 2013-01-15 01:39:25Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Andreas Radke # Contributor: Jan Jezek pkgname=tumbler pkgver=0.1.27 -pkgrel=1 +pkgrel=2 pkgdesc="D-Bus service for applications to request thumbnails" arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2' 'LGPL') groups=('xfce4') depends=('dbus-glib' 'gdk-pixbuf2') -makedepends=('intltool' 'ffmpegthumbnailer' 'gst-plugins-base-libs' - 'poppler-glib' 'libgsf' 'libopenraw' 'freetype2') +makedepends=('intltool' 'ffmpegthumbnailer' 'poppler-glib' 'libgsf' + 'libopenraw' 'freetype2') optdepends=('ffmpegthumbnailer: for video thumbnails' - 'gst-libav: for video thumbnails' 'poppler-glib: for PDF thumbnails' 'libgsf: for ODF thumbnails' 'libopenraw: for RAW thumbnails' @@ -32,7 +31,8 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ --disable-static \ - --disable-debug + --disable-debug \ + --disable-gstreamer-thumbnailer make } diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD index 438d25c4f..407b696dc 100644 --- a/extra/w3m/PKGBUILD +++ b/extra/w3m/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149346 2012-02-07 01:25:49Z bisson $ +# $Id: PKGBUILD 175136 2013-01-15 01:58:54Z bisson $ # Contributor: dorphell # Maintainer: Gaetan Bisson pkgname=w3m pkgver=0.5.3 -pkgrel=3 +pkgrel=4 pkgdesc='Text-based Web browser, as well as pager' url='http://w3m.sourceforge.net/' license=('custom') @@ -13,15 +13,20 @@ makedepends=('imlib2') optdepends=('imlib2: for graphics support') depends=('openssl' 'gc' 'ncurses') source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz" - 'https-segfault.patch') + 'file_handle.patch' + 'https.patch' + 'gc72.patch') sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' - '66affb2f695fe0bdde25cf774642bfd6a9404e88') + '457de43be7eabc652614461a7ab25e3ba76b2aff' + '66affb2f695fe0bdde25cf774642bfd6a9404e88' + '7baa06ca684fd140503a2adc65e2d606970c4662') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/file_handle/file_handle_rofl/g' -i istream.* - patch -p1 -i ../https-segfault.patch + patch -p1 -i ../file_handle.patch + patch -p1 -i ../https.patch + patch -p1 -i ../gc72.patch ./configure \ --prefix=/usr \ @@ -40,6 +45,6 @@ package() { make DESTDIR="${pkgdir}" install install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" - find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}" + find doc/* | grep -v CVS | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}" ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/extra/w3m/file_handle.patch b/extra/w3m/file_handle.patch new file mode 100644 index 000000000..15422294f --- /dev/null +++ b/extra/w3m/file_handle.patch @@ -0,0 +1,60 @@ +diff -Naur old/istream.c new/istream.c +--- old/istream.c 2011-01-04 20:22:22.000000000 +1100 ++++ new/istream.c 2012-07-04 21:50:51.529661517 +1000 +@@ -22,8 +22,8 @@ + static void basic_close(int *handle); + static int basic_read(int *handle, char *buf, int len); + +-static void file_close(struct file_handle *handle); +-static int file_read(struct file_handle *handle, char *buf, int len); ++static void file_close(struct file_handle_rofl *handle); ++static int file_read(struct file_handle_rofl *handle, char *buf, int len); + + static int str_read(Str handle, char *buf, int len); + +@@ -114,7 +114,7 @@ + stream = New(union input_stream); + init_base_stream(&stream->base, STREAM_BUF_SIZE); + stream->file.type = IST_FILE; +- stream->file.handle = New(struct file_handle); ++ stream->file.handle = New(struct file_handle_rofl); + stream->file.handle->f = f; + if (closep) + stream->file.handle->close = closep; +@@ -658,13 +658,13 @@ + } + + static void +-file_close(struct file_handle *handle) ++file_close(struct file_handle_rofl *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct file_handle_rofl *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } +diff -Naur old/istream.h new/istream.h +--- old/istream.h 2003-10-21 02:41:56.000000000 +1000 ++++ new/istream.h 2012-07-04 21:50:51.529661517 +1000 +@@ -20,7 +20,7 @@ + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct file_handle_rofl { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct file_handle_rofl *handle; + char type; + char iseos; + int (*read) (); diff --git a/extra/w3m/gc72.patch b/extra/w3m/gc72.patch new file mode 100644 index 000000000..47bd4c85c --- /dev/null +++ b/extra/w3m/gc72.patch @@ -0,0 +1,13 @@ +diff -Naur old/main.c new/main.c +--- old/main.c 2011-01-04 20:42:19.000000000 +1100 ++++ new/main.c 2012-07-04 21:49:10.136212236 +1000 +@@ -833,7 +833,8 @@ + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ orig_GC_warn_proc = GC_get_warn_proc(); ++ GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ diff --git a/extra/w3m/https.patch b/extra/w3m/https.patch new file mode 100644 index 000000000..31286a70d --- /dev/null +++ b/extra/w3m/https.patch @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, -- cgit v1.2.3-54-g00ecf