From 57d05f7209f022aa99a8850aafbeec4cb85c3b5b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Oct 2011 23:14:36 +0000 Subject: Mon Oct 3 23:14:36 UTC 2011 --- extra/claws-mail-extra-plugins/PKGBUILD | 22 +++-- extra/claws-mail-extra-plugins/webkit1.6.1.patch | 106 +++++++++++++++++++++++ extra/gnome-python-extras/PKGBUILD | 18 ++-- extra/liboauth/PKGBUILD | 29 +++++++ extra/mercurial/PKGBUILD | 10 +-- extra/vte/PKGBUILD | 51 +++-------- 6 files changed, 172 insertions(+), 64 deletions(-) create mode 100644 extra/claws-mail-extra-plugins/webkit1.6.1.patch create mode 100644 extra/liboauth/PKGBUILD (limited to 'extra') diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index b263ff58b..e252bbe96 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136389 2011-08-28 17:30:33Z andyrtr $ +# $Id: PKGBUILD 139484 2011-10-02 07:11:06Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Mildred pkgname=claws-mail-extra-plugins pkgver=3.7.10 -pkgrel=1 +pkgrel=2 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') arch=('i686' 'x86_64') depends=('claws-mail>=3.7.10') makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' - 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' 'perl: for perl plugin' @@ -32,15 +32,27 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') replaces=('sylpheed-claws-extra-plugins') options=('!libtool' '!strip') -source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) -md5sums=('fe782b2d4762c9727e22c1bb7979f7d6') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 + webkit1.6.1.patch) +md5sums=('fe782b2d4762c9727e22c1bb7979f7d6' + '8b94fa44072331b9c3926607eb42ba26') +sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf' + '8efd800617406dfe58a14422f243a678c582a90d') build() { cd "$srcdir/claws-mail-extra-plugins-$pkgver" + # fix for new webkit api + pushd fancy* + patch -Np0 -i ${srcdir}/webkit1.6.1.patch + popd + # fix for python2 export PYTHON="/usr/bin/python2" + # fix gdata plugin build + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure + for dir in */; do [[ $dir != geolocation_plugin-* ]] && ( cd $dir diff --git a/extra/claws-mail-extra-plugins/webkit1.6.1.patch b/extra/claws-mail-extra-plugins/webkit1.6.1.patch new file mode 100644 index 000000000..82bc5d062 --- /dev/null +++ b/extra/claws-mail-extra-plugins/webkit1.6.1.patch @@ -0,0 +1,106 @@ +--- src/fancy_viewer.c 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.c 2011-09-30 06:02:45.000000000 +0200 +@@ -83,8 +83,10 @@ + static void download_file_cb(GtkWidget *widget, FancyViewer *viewer); + #endif + +-/*FIXME substitute webkitwebsettings.cpp functions with their API when available */ +-gchar* webkit_web_view_get_selected_text(WebKitWebView* webView); ++#if !WEBKIT_CHECK_VERSION (1,5,1) ++gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view); ++#endif ++ + /*------*/ + static GtkWidget *fancy_get_widget(MimeViewer *_viewer) + { +@@ -243,6 +245,8 @@ + + gtk_print_unix_dialog_set_manual_capabilities(print_dialog, + GTK_PRINT_CAPABILITY_GENERATE_PS); ++ gtk_print_unix_dialog_set_manual_capabilities(print_dialog, ++ GTK_PRINT_CAPABILITY_PREVIEW); + + result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_hide (dialog); +@@ -293,7 +297,19 @@ + { + debug_print("fancy_get_selection\n"); + FancyViewer *viewer = (FancyViewer *) _viewer; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ gchar *sel = webkit_dom_range_get_text (viewer->range); ++#else + gchar *sel = webkit_web_view_get_selected_text(viewer->view); ++#endif + if (!viewer->view || strlen(sel) == 0) { + g_free(sel); + return NULL; +@@ -686,7 +702,15 @@ + debug_print("Clicked on Search on Web\n"); + if (webkit_web_view_has_selection(viewer->view)) { + gchar *search; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ gchar *tmp = webkit_dom_range_get_text (viewer->range); ++#else + gchar *tmp = webkit_web_view_get_selected_text(viewer->view); ++#endif + search = g_strconcat(GOOGLE_SEARCH, tmp, NULL); + webkit_web_view_open(viewer->view, search); + g_free(search); +@@ -896,7 +920,6 @@ + static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu, + FancyViewer *viewer) + { +- /*FIXME hack..until webkit does not give the proper way to handle it*/ + Plugin *plugin = plugin_get_loaded_by_name("RSSyl"); + gtk_container_foreach(GTK_CONTAINER(menu), + (GtkCallback)viewer_menu_handler, +@@ -941,7 +964,19 @@ + if (webkit_web_view_can_copy_clipboard(view)) { + GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); + const gchar *sel_text; +- sel_text = (const gchar*)webkit_web_view_get_selected_text(view); ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range); ++#else ++ sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view); ++#endif + gtk_clipboard_set_text(wv_clipboard, sel_text, -1); + } + return FALSE; +--- src/fancy_viewer.h 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.h 2011-09-30 06:02:45.000000000 +0200 +@@ -113,6 +113,14 @@ + gint tag; + gint loading; + gint stop_previous; ++ ++ /* DOM Objects */ ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ WebKitDOMDocument *doc; ++ WebKitDOMDOMWindow *window; ++ WebKitDOMDOMSelection *selection; ++ WebKitDOMRange *range; ++#endif + }; + #define OPEN_INTERNAL FALSE + #define OPEN_EXTERNAL TRUE diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index ed65bc42a..18d6b3de3 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 131702 2011-07-13 15:39:40Z ibiru $ +# $Id: PKGBUILD 139493 2011-10-02 11:50:40Z ibiru $ # Maintainer: Jan de Groot pkgbase=gnome-python-extras -pkgname=('gnome-python-extras' 'python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') +pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') pkgver=2.25.3 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') -makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'libgda' 'python2' 'pygtk' 'gnome-python') +makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2 gnome-python-extras-2.25.3-update-for-2.27.2.patch) @@ -24,7 +24,7 @@ build() { package_gnome-python-extras() { pkgdesc="Gnome Python interfaces for libraries not part of the core platform" - depends=('python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') + depends=('python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') cd "${srcdir}/gnome-python-extras-${pkgver}" make install-pkgconfigDATA DESTDIR="${pkgdir}" @@ -38,14 +38,6 @@ package_python2-egg(){ make -C egg install DESTDIR="${pkgdir}" } -package_python2-gda(){ - pkgdesc="Python bindings for interacting with gda" - depends=('libgda' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gda install DESTDIR="${pkgdir}" -} - package_python2-gksu2() { pkgdesc="Python bindings for the gksu2" depends=('libgksu' 'pygtk') diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD new file mode 100644 index 000000000..1af7a2b70 --- /dev/null +++ b/extra/liboauth/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 139509 2011-10-02 17:00:45Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Kaiting Chen +# Contributor: Martin Häger + +pkgname=liboauth +pkgver=0.9.4 +pkgrel=2 +pkgdesc='C library implementing OAuth Core RFC 5849' +arch=('i686' 'x86_64') +url='http://liboauth.sourceforge.net' +license=('MIT') +depends=('curl') +options=('!libtool') +source=("$url/pool/$pkgname-$pkgver.tar.gz") +sha256sums=('77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make + +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING.MIT "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index ba793daa7..eb16fa797 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136368 2011-08-27 23:37:57Z giovanni $ +# $Id: PKGBUILD 139517 2011-10-02 23:55:56Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -12,9 +12,9 @@ license=('GPL') depends=('python2') optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') -source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz - mercurial.profile) -md5sums=('0bda8040e2626e70d3d1a0654b0b03f2' +source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" + 'mercurial.profile') +md5sums=('f309b084aaf58773e9f4f4d66c49622a' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 863215a31..5cd10f758 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,66 +1,35 @@ -# $Id: PKGBUILD 136406 2011-08-29 07:32:55Z ibiru $ +# $Id: PKGBUILD 139491 2011-10-02 09:08:18Z ibiru $ # Maintainer: Jan de Groot -pkgbase=vte -pkgname=(vte vte3 vte-common) +pkgname=vte pkgver=0.28.2 -pkgrel=1 -pkgdesc="Virtual Terminal Emulator widget for use with" +pkgrel=2 +pkgdesc="Virtual Terminal Emulator widget for use with GTK2" arch=('i686' 'x86_64') license=('LGPL') options=('!libtool' '!emptydirs') -makedepends=('pygtk' 'intltool' 'gobject-introspection' 'gtk2' 'gtk3' 'pygobject-devel' 'gtk-doc') +depends=('gtk2' 'vte-common') +makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel' 'gtk-doc') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz) sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" - mkdir build-gtk2 - pushd build-gtk2 - PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ --enable-introspection --with-gtk=2.0 \ --enable-gtk-doc make - popd - - mkdir build-gtk3 - pushd build-gtk3 - PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vte \ - --localstatedir=/var --disable-static \ - --enable-introspection --with-gtk=3.0 \ - --enable-gtk-doc - make - popd } -package_vte(){ - pkgdesc+=" GTK2" - depends=('gtk2' 'vte-common') - cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk2 +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper } - -package_vte3(){ - pkgdesc+=" GTK3" - depends=('gtk3' 'vte-common') - cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3 - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper -} - -package_vte-common() { - pkgdesc="Common files used by vte and vte3" - cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3 - - make -C gnome-pty-helper DESTDIR="${pkgdir}" install -} -- cgit v1.2.3-54-g00ecf