diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
| commit | 61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch) | |
| tree | 6b8b6fb14ede5aae651e92f593252dba143cee74 /extra/epiphany-extensions | |
| parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
| parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
Diffstat (limited to 'extra/epiphany-extensions')
| -rw-r--r-- | extra/epiphany-extensions/rss-link-dbus-glib.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/extra/epiphany-extensions/rss-link-dbus-glib.patch b/extra/epiphany-extensions/rss-link-dbus-glib.patch deleted file mode 100644 index 1737c49ea..000000000 --- a/extra/epiphany-extensions/rss-link-dbus-glib.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sat, 19 Nov 2011 01:01:12 -0500 -Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD - -Otherwise, epiphany-3.2 crashes. - -https://bugzilla.gnome.org/show_bug.cgi?id=664369 ---- - extensions/rss/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am -index ed6962f..da669c8 100644 ---- a/extensions/rss/Makefile.am -+++ b/extensions/rss/Makefile.am -@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \ - -export-symbols $(top_srcdir)/ephy-extension.symbols \ - $(AM_LDFLAGS) - -+librssextension_la_LIBADD = \ -+ $(DBUS_LIBS) -+ - uidir = $(pkgdatadir)/ui - ui_DATA = rss-ui.ui - --- -1.7.8.rc3 - |