remove extra file, debian/patches/0001-Don-t-expressly-use-libkatze- in-extensions-to-avoid.patch

This commit is contained in:
Ryan Niebur 2009-05-29 20:03:52 -07:00
parent 381b908542
commit 875cc6da53
4 changed files with 19 additions and 58 deletions

View file

@ -19,3 +19,17 @@ text=Dictionary, Encyclopedia and Thesaurus
uri=http://www.thefreedictionary.com/%s
icon=
token=fd
[Debian Packages]
name=Debian Packages
text=Search Debian Packages
uri=http://packages.debian.org/%s
icon=
token=d
[Debian Bugs]
name=Debian Bugs
text=Debian Bugs Search
uri=http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s
icon=
token=dbs

4
debian/changelog vendored
View file

@ -19,8 +19,10 @@ midori (0.1.7-1) UNRELEASED; urgency=low
firefox). This addresses the other half of the ubuntu diff.
* add recommends on libnotify1
* update copyright information
* remove extra file, debian/patches/0001-Don-t-expressly-use-libkatze-
in-extensions-to-avoid.patch
-- Ryan Niebur <ryanryan52@gmail.com> Fri, 29 May 2009 20:01:25 -0700
-- Ryan Niebur <ryanryan52@gmail.com> Fri, 29 May 2009 20:03:28 -0700
midori (0.1.6-1) experimental; urgency=low

View file

@ -1,56 +0,0 @@
From ed2a35d70b78232562aeb1ba0158fe785916c96b Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 30 Mar 2009 00:14:43 +0200
Subject: [PATCH] Don't expressly use libkatze in extensions to avoid -fPIC problem
---
extensions/wscript_build | 1 -
katze/wscript_build | 3 ---
midori/wscript_build | 6 ------
3 files changed, 0 insertions(+), 10 deletions(-)
Index: midori-0.1.5/extensions/wscript_build
===================================================================
--- midori-0.1.5.orig/extensions/wscript_build 2009-03-31 17:23:09.000000000 +1100
+++ midori-0.1.5/extensions/wscript_build 2009-03-31 17:23:14.000000000 +1100
@@ -26,5 +26,4 @@
obj.includes = '..'
obj.source = source
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
- obj.uselib_local = 'katze'
obj.install_path = '${LIBDIR}/midori'
Index: midori-0.1.5/katze/wscript_build
===================================================================
--- midori-0.1.5.orig/katze/wscript_build 2009-03-31 17:23:09.000000000 +1100
+++ midori-0.1.5/katze/wscript_build 2009-03-31 17:23:14.000000000 +1100
@@ -11,6 +11,3 @@
obj.find_sources_in_dirs ('.')
obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML'
obj.install_path = None
-
-if platform.architecture ()[0] == '64bit':
- obj.env.append_value ('CCFLAGS', '-fPIC')
Index: midori-0.1.5/midori/wscript_build
===================================================================
--- midori-0.1.5.orig/midori/wscript_build 2009-03-31 17:23:09.000000000 +1100
+++ midori-0.1.5/midori/wscript_build 2009-03-31 17:23:14.000000000 +1100
@@ -14,9 +14,6 @@
obj.uselib_local = 'katze'
obj.install_path = None
-if platform.architecture ()[0] == '64bit':
- obj.env.append_value ('CCFLAGS', '-fPIC')
-
obj = bld.new_task_gen ('cc', 'staticlib')
obj.name = 'panels'
obj.target = 'panels'
@@ -26,9 +23,6 @@
obj.uselib_local = 'midori'
obj.install_path = None
-if platform.architecture ()[0] == '64bit':
- obj.env.append_value ('CCFLAGS', '-fPIC')
-
obj = bld.new_task_gen ('cc', 'program')
obj.target = 'midori'
obj.includes = '. .. ../panels'

View file

@ -10,6 +10,7 @@
*/
#include "midori-websettings.h"
#include "midori-debian.h"
#include "sokoke.h"
@ -558,7 +559,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
"homepage",
_("Homepage"),
_("The homepage"),
"http://www.google.com",
DEBIAN_DISTRO_DEFAULT_HOMEPAGE,
flags));
/**