[arch-commits] Commit in xfce4-smartbookmark-plugin/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon May 14 20:21:29 UTC 2012
Date: Monday, May 14, 2012 @ 16:21:29
Author: foutrelis
Revision: 159006
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xfce4-smartbookmark-plugin/repos/extra-i686/PKGBUILD
(from rev 159005, xfce4-smartbookmark-plugin/trunk/PKGBUILD)
xfce4-smartbookmark-plugin/repos/extra-i686/use-exo-open-instead-of-xfbrowser4.patch
(from rev 159005, xfce4-smartbookmark-plugin/trunk/use-exo-open-instead-of-xfbrowser4.patch)
xfce4-smartbookmark-plugin/repos/extra-i686/xfce4-smartbookmark-plugin-archlinux.patch
(from rev 159005, xfce4-smartbookmark-plugin/trunk/xfce4-smartbookmark-plugin-archlinux.patch)
xfce4-smartbookmark-plugin/repos/extra-x86_64/PKGBUILD
(from rev 159005, xfce4-smartbookmark-plugin/trunk/PKGBUILD)
xfce4-smartbookmark-plugin/repos/extra-x86_64/use-exo-open-instead-of-xfbrowser4.patch
(from rev 159005, xfce4-smartbookmark-plugin/trunk/use-exo-open-instead-of-xfbrowser4.patch)
xfce4-smartbookmark-plugin/repos/extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch
(from rev 159005, xfce4-smartbookmark-plugin/trunk/xfce4-smartbookmark-plugin-archlinux.patch)
Deleted:
xfce4-smartbookmark-plugin/repos/extra-i686/PKGBUILD
xfce4-smartbookmark-plugin/repos/extra-i686/xfce4-smartbookmark-plugin-archlinux.patch
xfce4-smartbookmark-plugin/repos/extra-x86_64/PKGBUILD
xfce4-smartbookmark-plugin/repos/extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch
---------------------------------------------------------+
extra-i686/PKGBUILD | 81 +++++++-------
extra-i686/use-exo-open-instead-of-xfbrowser4.patch | 37 ++++++
extra-i686/xfce4-smartbookmark-plugin-archlinux.patch | 48 ++++----
extra-x86_64/PKGBUILD | 81 +++++++-------
extra-x86_64/use-exo-open-instead-of-xfbrowser4.patch | 37 ++++++
extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch | 48 ++++----
6 files changed, 212 insertions(+), 120 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-05-14 20:21:04 UTC (rev 159005)
+++ extra-i686/PKGBUILD 2012-05-14 20:21:29 UTC (rev 159006)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-smartbookmark-plugin
-pkgver=0.4.4
-pkgrel=2
-pkgdesc="Plugin for the Xfce4 panel that let you quicksearch from selected websites"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool' 'libxt')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2
- xfce4-smartbookmark-plugin-archlinux.patch)
-md5sums=('273e38306a82f14e1b8c2c5db912f6c3'
- '323ac898cfcfdb078f67f9ecd1905aec')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i "${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --disable-debug
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: xfce4-smartbookmark-plugin/repos/extra-i686/PKGBUILD (from rev 159005, xfce4-smartbookmark-plugin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-05-14 20:21:29 UTC (rev 159006)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer:
+# Contributor: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-smartbookmark-plugin
+pkgver=0.4.4
+pkgrel=3
+pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
+license=('GPL2')
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4')
+makedepends=('intltool' 'libxt')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
+ xfce4-smartbookmark-plugin-archlinux.patch
+ use-exo-open-instead-of-xfbrowser4.patch)
+sha256sums=('6c77e8fee0ec4dcee7aa34d94377e068a522b1ea650823422f2f5cca8126f2ed'
+ 'a126b086811b60a8f3cd1a2b818cb6b9a9c6e959e00db1499b114fa8803325e6'
+ '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -Np0 -i "$srcdir/xfce4-smartbookmark-plugin-archlinux.patch"
+ patch -Np1 -i "$srcdir/use-exo-open-instead-of-xfbrowser4.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfce4-smartbookmark-plugin/repos/extra-i686/use-exo-open-instead-of-xfbrowser4.patch (from rev 159005, xfce4-smartbookmark-plugin/trunk/use-exo-open-instead-of-xfbrowser4.patch)
===================================================================
--- extra-i686/use-exo-open-instead-of-xfbrowser4.patch (rev 0)
+++ extra-i686/use-exo-open-instead-of-xfbrowser4.patch 2012-05-14 20:21:29 UTC (rev 159006)
@@ -0,0 +1,37 @@
+--- xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
++++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
+@@ -75,18 +75,27 @@ XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(smar
+
+ static gboolean do_search(const char *url, const char *keyword)
+ {
++ gchar *argv[] = { "exo-open", "--launch", "WebBrowser", NULL, NULL };
++ gchar *complete_url;
++ gboolean retval;
++ GError *error = NULL;
++
+ DBG ("Do search");
+- gchar *execute;
+- gboolean success;
+- execute = g_strconcat("xfbrowser4 \"", url, NULL);//works better for me
+- //execute = g_strconcat("x-www-browser \"", url, NULL);
+- execute = g_strconcat(execute, keyword, NULL);
+- execute = g_strconcat(execute, "\"", NULL);
+
+- success = exec_command(execute);
+- g_free(execute);
++ complete_url = g_strconcat(url, keyword, NULL);
++ argv[3] = complete_url;
++
++ retval = g_spawn_async(NULL, (gchar **)argv, NULL,
++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &error);
++
++ g_free(complete_url);
++
++ if (!retval) {
++ xfce_err("%s", error->message);
++ g_error_free(error);
++ }
+
+- return success;
++ return retval;
+ }
Deleted: extra-i686/xfce4-smartbookmark-plugin-archlinux.patch
===================================================================
--- extra-i686/xfce4-smartbookmark-plugin-archlinux.patch 2012-05-14 20:21:04 UTC (rev 159005)
+++ extra-i686/xfce4-smartbookmark-plugin-archlinux.patch 2012-05-14 20:21:29 UTC (rev 159006)
@@ -1,24 +0,0 @@
---- src/smartbookmark.c.redhat 2006-12-18 02:06:21.000000000 +0100
-+++ src/smartbookmark.c 2006-12-18 02:11:33.000000000 +0100
-@@ -197,8 +197,8 @@
- box = gtk_vbox_new(FALSE, 0);
-
- /* default options */
-- search->url = "http://bugs.debian.org/";
-- search->label_text = "BTS";
-+ search->url = "http://bugs.archlinux.org/";
-+ search->label_text = "ArchBug #";
- search->size = 5;
- search->hide_label = FALSE;
- /* read config file options */
-@@ -269,8 +269,8 @@
- if( (rcfile = xfce_rc_simple_open(filename, TRUE) ))
- {
- xfce_rc_set_group(rcfile, NULL);
-- search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.debian.org/"));
-- search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","DBS"));
-+ search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.archlinux.org/"));
-+ search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","ArchBug #"));
- search->size = xfce_rc_read_int_entry(rcfile, "size", 5);
- search->hide_label = xfce_rc_read_bool_entry(rcfile, "hidelabel", FALSE);
- }
Copied: xfce4-smartbookmark-plugin/repos/extra-i686/xfce4-smartbookmark-plugin-archlinux.patch (from rev 159005, xfce4-smartbookmark-plugin/trunk/xfce4-smartbookmark-plugin-archlinux.patch)
===================================================================
--- extra-i686/xfce4-smartbookmark-plugin-archlinux.patch (rev 0)
+++ extra-i686/xfce4-smartbookmark-plugin-archlinux.patch 2012-05-14 20:21:29 UTC (rev 159006)
@@ -0,0 +1,24 @@
+--- src/smartbookmark.c.redhat 2006-12-18 02:06:21.000000000 +0100
++++ src/smartbookmark.c 2006-12-18 02:11:33.000000000 +0100
+@@ -197,8 +197,8 @@
+ box = gtk_vbox_new(FALSE, 0);
+
+ /* default options */
+- search->url = "http://bugs.debian.org/";
+- search->label_text = "BTS";
++ search->url = "http://bugs.archlinux.org/";
++ search->label_text = "ArchBug #";
+ search->size = 5;
+ search->hide_label = FALSE;
+ /* read config file options */
+@@ -269,8 +269,8 @@
+ if( (rcfile = xfce_rc_simple_open(filename, TRUE) ))
+ {
+ xfce_rc_set_group(rcfile, NULL);
+- search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.debian.org/"));
+- search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","DBS"));
++ search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.archlinux.org/"));
++ search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","ArchBug #"));
+ search->size = xfce_rc_read_int_entry(rcfile, "size", 5);
+ search->hide_label = xfce_rc_read_bool_entry(rcfile, "hidelabel", FALSE);
+ }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-05-14 20:21:04 UTC (rev 159005)
+++ extra-x86_64/PKGBUILD 2012-05-14 20:21:29 UTC (rev 159006)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-smartbookmark-plugin
-pkgver=0.4.4
-pkgrel=2
-pkgdesc="Plugin for the Xfce4 panel that let you quicksearch from selected websites"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool' 'libxt')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2
- xfce4-smartbookmark-plugin-archlinux.patch)
-md5sums=('273e38306a82f14e1b8c2c5db912f6c3'
- '323ac898cfcfdb078f67f9ecd1905aec')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i "${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --disable-debug
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: xfce4-smartbookmark-plugin/repos/extra-x86_64/PKGBUILD (from rev 159005, xfce4-smartbookmark-plugin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-05-14 20:21:29 UTC (rev 159006)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer:
+# Contributor: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-smartbookmark-plugin
+pkgver=0.4.4
+pkgrel=3
+pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
+license=('GPL2')
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4')
+makedepends=('intltool' 'libxt')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
+ xfce4-smartbookmark-plugin-archlinux.patch
+ use-exo-open-instead-of-xfbrowser4.patch)
+sha256sums=('6c77e8fee0ec4dcee7aa34d94377e068a522b1ea650823422f2f5cca8126f2ed'
+ 'a126b086811b60a8f3cd1a2b818cb6b9a9c6e959e00db1499b114fa8803325e6'
+ '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -Np0 -i "$srcdir/xfce4-smartbookmark-plugin-archlinux.patch"
+ patch -Np1 -i "$srcdir/use-exo-open-instead-of-xfbrowser4.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfce4-smartbookmark-plugin/repos/extra-x86_64/use-exo-open-instead-of-xfbrowser4.patch (from rev 159005, xfce4-smartbookmark-plugin/trunk/use-exo-open-instead-of-xfbrowser4.patch)
===================================================================
--- extra-x86_64/use-exo-open-instead-of-xfbrowser4.patch (rev 0)
+++ extra-x86_64/use-exo-open-instead-of-xfbrowser4.patch 2012-05-14 20:21:29 UTC (rev 159006)
@@ -0,0 +1,37 @@
+--- xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
++++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
+@@ -75,18 +75,27 @@ XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(smar
+
+ static gboolean do_search(const char *url, const char *keyword)
+ {
++ gchar *argv[] = { "exo-open", "--launch", "WebBrowser", NULL, NULL };
++ gchar *complete_url;
++ gboolean retval;
++ GError *error = NULL;
++
+ DBG ("Do search");
+- gchar *execute;
+- gboolean success;
+- execute = g_strconcat("xfbrowser4 \"", url, NULL);//works better for me
+- //execute = g_strconcat("x-www-browser \"", url, NULL);
+- execute = g_strconcat(execute, keyword, NULL);
+- execute = g_strconcat(execute, "\"", NULL);
+
+- success = exec_command(execute);
+- g_free(execute);
++ complete_url = g_strconcat(url, keyword, NULL);
++ argv[3] = complete_url;
++
++ retval = g_spawn_async(NULL, (gchar **)argv, NULL,
++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &error);
++
++ g_free(complete_url);
++
++ if (!retval) {
++ xfce_err("%s", error->message);
++ g_error_free(error);
++ }
+
+- return success;
++ return retval;
+ }
Deleted: extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch
===================================================================
--- extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch 2012-05-14 20:21:04 UTC (rev 159005)
+++ extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch 2012-05-14 20:21:29 UTC (rev 159006)
@@ -1,24 +0,0 @@
---- src/smartbookmark.c.redhat 2006-12-18 02:06:21.000000000 +0100
-+++ src/smartbookmark.c 2006-12-18 02:11:33.000000000 +0100
-@@ -197,8 +197,8 @@
- box = gtk_vbox_new(FALSE, 0);
-
- /* default options */
-- search->url = "http://bugs.debian.org/";
-- search->label_text = "BTS";
-+ search->url = "http://bugs.archlinux.org/";
-+ search->label_text = "ArchBug #";
- search->size = 5;
- search->hide_label = FALSE;
- /* read config file options */
-@@ -269,8 +269,8 @@
- if( (rcfile = xfce_rc_simple_open(filename, TRUE) ))
- {
- xfce_rc_set_group(rcfile, NULL);
-- search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.debian.org/"));
-- search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","DBS"));
-+ search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.archlinux.org/"));
-+ search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","ArchBug #"));
- search->size = xfce_rc_read_int_entry(rcfile, "size", 5);
- search->hide_label = xfce_rc_read_bool_entry(rcfile, "hidelabel", FALSE);
- }
Copied: xfce4-smartbookmark-plugin/repos/extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch (from rev 159005, xfce4-smartbookmark-plugin/trunk/xfce4-smartbookmark-plugin-archlinux.patch)
===================================================================
--- extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch (rev 0)
+++ extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch 2012-05-14 20:21:29 UTC (rev 159006)
@@ -0,0 +1,24 @@
+--- src/smartbookmark.c.redhat 2006-12-18 02:06:21.000000000 +0100
++++ src/smartbookmark.c 2006-12-18 02:11:33.000000000 +0100
+@@ -197,8 +197,8 @@
+ box = gtk_vbox_new(FALSE, 0);
+
+ /* default options */
+- search->url = "http://bugs.debian.org/";
+- search->label_text = "BTS";
++ search->url = "http://bugs.archlinux.org/";
++ search->label_text = "ArchBug #";
+ search->size = 5;
+ search->hide_label = FALSE;
+ /* read config file options */
+@@ -269,8 +269,8 @@
+ if( (rcfile = xfce_rc_simple_open(filename, TRUE) ))
+ {
+ xfce_rc_set_group(rcfile, NULL);
+- search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.debian.org/"));
+- search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","DBS"));
++ search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.archlinux.org/"));
++ search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","ArchBug #"));
+ search->size = xfce_rc_read_int_entry(rcfile, "size", 5);
+ search->hide_label = xfce_rc_read_bool_entry(rcfile, "hidelabel", FALSE);
+ }
More information about the arch-commits
mailing list