summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2008-03-29 14:58:29 +0000
committerCédric Krier <cedk@gentoo.org>2008-03-29 14:58:29 +0000
commitae62083b0091e6c1b9d59455f4980c46f69ea3d7 (patch)
tree5dab6fd90d61e37dc195c890c4839b764b517eb8 /app-misc/beagle/files
parentfix new ffmpeg header structur added; bug #214740 (diff)
downloadgentoo-2-ae62083b0091e6c1b9d59455f4980c46f69ea3d7.tar.gz
gentoo-2-ae62083b0091e6c1b9d59455f4980c46f69ea3d7.tar.bz2
gentoo-2-ae62083b0091e6c1b9d59455f4980c46f69ea3d7.zip
Add patch for epiphany and dbus
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-misc/beagle/files')
-rw-r--r--app-misc/beagle/files/beagle-0.3.3-log-level-warn.patch34
-rw-r--r--app-misc/beagle/files/beagle-0.3.4-dbus.patch12
-rw-r--r--app-misc/beagle/files/beagle-0.3.4-epiphany-extension.patch19
3 files changed, 31 insertions, 34 deletions
diff --git a/app-misc/beagle/files/beagle-0.3.3-log-level-warn.patch b/app-misc/beagle/files/beagle-0.3.3-log-level-warn.patch
deleted file mode 100644
index 307b10693eb0..000000000000
--- a/app-misc/beagle/files/beagle-0.3.3-log-level-warn.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: beagled/BeagleDaemon.cs
-===================================================================
---- beagled/BeagleDaemon.cs (revision 4355)
-+++ beagled/BeagleDaemon.cs (working copy)
-@@ -455,7 +455,7 @@
- // debugging this code, after all...
- // arg_debug ? LogLevel.Debug : LogLevel.Warn
-
-- Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
-+ Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
- Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
- Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
- Log.Always ("Command Line: {0}",
-Index: beagled/IndexHelper/IndexHelper.cs
-===================================================================
---- beagled/IndexHelper/IndexHelper.cs (revision 4355)
-+++ beagled/IndexHelper/IndexHelper.cs (working copy)
-@@ -92,14 +92,13 @@
-
- // FIXME: We always turn on full debugging output! We are still
- // debugging this code, after all...
-- //bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
-+ bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
-
- last_activity = DateTime.Now;
-
- Log.Initialize (PathFinder.LogDir,
- "IndexHelper",
-- //debug ? LogLevel.Debug : LogLevel.Warn,
-- LogLevel.Debug,
-+ debug ? LogLevel.Debug : LogLevel.Warn,
- run_by_hand || log_in_fg);
-
- Log.Always ("Starting Index Helper process (version {0})", ExternalStringsHack.Version);
diff --git a/app-misc/beagle/files/beagle-0.3.4-dbus.patch b/app-misc/beagle/files/beagle-0.3.4-dbus.patch
new file mode 100644
index 000000000000..3be0b2290006
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.4-dbus.patch
@@ -0,0 +1,12 @@
+diff -ru beagle-0.3.4~/search/Beagle.Search/Driver.cs beagle-0.3.4/search/Beagle.Search/Driver.cs
+--- beagle-0.3.4~/search/Beagle.Search/Driver.cs 2008-03-29 15:38:54.000000000 +0100
++++ beagle-0.3.4/search/Beagle.Search/Driver.cs 2008-03-29 15:47:06.000000000 +0100
+@@ -124,7 +124,7 @@
+ if (!String.IsNullOrEmpty (query) || !icon_enabled)
+ search.Query (query);
+
+- Bus.Session.Register (new ObjectPath (PATH_NAME), search);
++ Bus.Session.Register (BUS_NAME, new ObjectPath (PATH_NAME), search);
+
+ program.Run ();
+ }
diff --git a/app-misc/beagle/files/beagle-0.3.4-epiphany-extension.patch b/app-misc/beagle/files/beagle-0.3.4-epiphany-extension.patch
new file mode 100644
index 000000000000..b3eb9b8a626f
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.4-epiphany-extension.patch
@@ -0,0 +1,19 @@
+diff -ru beagle-0.3.4~/epiphany-extension/Makefile.am beagle-0.3.4/epiphany-extension/Makefile.am
+--- beagle-0.3.4~/epiphany-extension/Makefile.am 2008-03-29 15:38:54.000000000 +0100
++++ beagle-0.3.4/epiphany-extension/Makefile.am 2008-03-29 15:39:43.000000000 +0100
+@@ -10,11 +10,11 @@
+
+ # Hack to fix distcheck
+ if INSTALL_EPIPHANY_EXTENSION
+- extensiondir = $(EPIPHANY_EXTENSIONS_DIR)
+- extension_DATA = $(extension_files) beagle.py
++extensiondir = $(EPIPHANY_EXTENSIONS_DIR)
++extension_DATA = $(extension_files) beagle.py
+ else
+- extensiondir = $(libdir)/epiphany/extensions
+- extension_DATA = $(extension_files) beagle.py
++extensiondir = $(libdir)/epiphany/extensions
++extension_DATA = $(extension_files) beagle.py
+ endif
+
+ EXTRA_DIST = $(extension_in_files) beagle.py.in