rpms/devhelp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove unused patches

Browse Source
This commit is contained in:
Debarshi Ray 2012-03-27 13:48:16 +02:00 committed by Debarshi Ray
parent 555b329ffc
commit 4d681d9d47
8 changed files with 0 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Fix-broken-schemas-file.patch
View File

@ -1,27 +0,0 @@
From 8f13eaeb35a14f0fee8804e1b5860344f8a2a4d1 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 9 Sep 2010 15:17:02 +0100
Subject: [PATCH 1/2] Fix broken schemas file
WARNING: no <list_type> specified for schema of type list
WARNING: invalid or missing list_type for schema (/schemas/apps/devhelp/state/main/contents/books_disabled)
WARNING: failed to install schema `/schemas/apps/devhelp/state/main/contents/books_disabled', locale `C': Schema specifies type list but doesn't specify the type of the list elements
---
data/devhelp.schemas.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/data/devhelp.schemas.in b/data/devhelp.schemas.in
index eebeb72..c30d76a 100644
--- a/data/devhelp.schemas.in
+++ b/data/devhelp.schemas.in
@@ -131,6 +131,7 @@
<applyto>/apps/devhelp/state/main/contents/books_disabled</applyto>
<owner>devhelp</owner>
<type>list</type>
+ <list_type>string</list_type>
<default></default>
<locale name="C">
<short>Books disabled</short>
--
1.7.2.3

66
0001-GtkNotebookPage-has-been-removed-in-GTK-aa017fa.patch
View File

@ -1,66 +0,0 @@
From ae2897ec20de184ff793e0bdc78f72c57a89f030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
Date: Sat, 17 Jul 2010 10:42:25 +0200
Subject: [PATCH] GtkNotebookPage has been removed in GTK+ (aa017fa)
---
src/dh-util.c | 2 +-
src/dh-window.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/dh-util.c b/src/dh-util.c
index 77a0b32..85a25d6 100644
--- a/src/dh-util.c
+++ b/src/dh-util.c
@@ -517,7 +517,7 @@ util_state_notebook_timeout_cb (gpointer notebook)
static void
util_state_notebook_switch_page_cb (GtkWidget *notebook,
- GtkNotebookPage *page,
+ gpointer page,
guint page_num,
gpointer user_data)
{
diff --git a/src/dh-window.c b/src/dh-window.c
index 760e9b1..2fcec5f 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -983,7 +983,7 @@ dh_window_init (DhWindow *window)
*/
static void
window_control_switch_page_cb (GtkWidget *notebook,
- GtkNotebookPage *page,
+ gpointer page,
guint page_num,
DhWindow *window)
{
@@ -998,7 +998,7 @@ window_control_switch_page_cb (GtkWidget *notebook,
static void
window_control_after_switch_page_cb (GtkWidget *notebook,
- GtkNotebookPage *page,
+ gpointer page,
guint page_num,
DhWindow *window)
{
@@ -1013,7 +1013,7 @@ window_control_after_switch_page_cb (GtkWidget *notebook,
static void
window_web_view_switch_page_cb (GtkNotebook *notebook,
- GtkNotebookPage *page,
+ gpointer page,
guint new_page_num,
DhWindow *window)
{
@@ -1051,7 +1051,7 @@ window_web_view_switch_page_cb (GtkNotebook *notebook,
static void
window_web_view_switch_page_after_cb (GtkNotebook *notebook,
- GtkNotebookPage *page,
+ gpointer page,
guint new_page_num,
DhWindow *window)
{
--
1.7.3.2

27
0001-pkgconfig-Require-webkitgtk-3.0-instead-of-webkit-3..patch
View File

@ -1,27 +0,0 @@
From 941342f37471320eae9e8e851de2d7a54d283a90 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Sun, 22 Aug 2010 16:29:01 +0300
Subject: [PATCH 1/2] pkgconfig: Require webkitgtk-3.0 instead of webkit-3.0
The GTK+ 3 version of WebKit installs webkitgtk-3.0.pc, whereas the
GTK+ 2 version used to install webkit-1.0.pc.
---
data/libdevhelp-3.0.pc.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/data/libdevhelp-3.0.pc.in b/data/libdevhelp-3.0.pc.in
index e63e80b..b3db9f8 100644
--- a/data/libdevhelp-3.0.pc.in
+++ b/data/libdevhelp-3.0.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
Name: devhelp
Description: devhelp
-Requires: gtk+-3.0 webkit-3.0
+Requires: gtk+-3.0 webkitgtk-3.0
Requires.private: @REQUIRES_LIBWNCK@
Version: @VERSION@
Libs: -L${libdir} -ldevhelp-3
--
1.7.2.1

127
0002-Fix-use-of-disabled_books.patch
View File

@ -1,127 +0,0 @@
From 923222cdb5db06aade198de26ce777308b4cf960 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 9 Sep 2010 15:17:52 +0100
Subject: [PATCH 2/2] Fix use of "disabled_books"
The schemas actually requires books_disabled instead.
---
src/dh-book-manager.c | 20 ++++++++++----------
src/dh-util.c | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/dh-book-manager.c b/src/dh-book-manager.c
index 9549c5a..5726439 100644
--- a/src/dh-book-manager.c
+++ b/src/dh-book-manager.c
@@ -106,11 +106,11 @@ dh_book_manager_init (DhBookManager *book_manager)
}
static void
-book_manager_clean_list_of_disabled_books (GSList *disabled_books)
+book_manager_clean_list_of_books_disabled (GSList *books_disabled)
{
GSList *sl;
- for (sl = disabled_books; sl; sl = g_slist_next (sl)) {
+ for (sl = books_disabled; sl; sl = g_slist_next (sl)) {
g_free (sl->data);
}
g_slist_free (sl);
@@ -119,11 +119,11 @@ book_manager_clean_list_of_disabled_books (GSList *disabled_books)
static void
book_manager_check_status_from_conf (DhBookManager *book_manager)
{
- GSList *disabled_books, *sl;
+ GSList *books_disabled, *sl;
- disabled_books = dh_util_state_load_disabled_books ();
+ books_disabled = dh_util_state_load_books_disabled ();
- for (sl = disabled_books; sl; sl = g_slist_next (sl)) {
+ for (sl = books_disabled; sl; sl = g_slist_next (sl)) {
DhBook *book;
book = dh_book_manager_get_book_by_name (book_manager,
@@ -133,7 +133,7 @@ book_manager_check_status_from_conf (DhBookManager *book_manager)
}
}
- book_manager_clean_list_of_disabled_books (disabled_books);
+ book_manager_clean_list_of_books_disabled (books_disabled);
}
static void
@@ -372,7 +372,7 @@ void
dh_book_manager_update (DhBookManager *book_manager)
{
DhBookManagerPriv *priv;
- GSList *disabled_books = NULL;
+ GSList *books_disabled = NULL;
GList *l;
g_return_if_fail (book_manager);
@@ -384,20 +384,20 @@ dh_book_manager_update (DhBookManager *book_manager)
DhBook *book = DH_BOOK (l->data);
if (!dh_book_get_enabled (book)) {
- disabled_books = g_slist_append (disabled_books,
+ books_disabled = g_slist_append (books_disabled,
g_strdup (dh_book_get_name (book)));
}
}
/* Store in conf */
- dh_util_state_store_disabled_books (disabled_books);
+ dh_util_state_store_books_disabled (books_disabled);
/* Emit signal to notify others */
g_signal_emit (book_manager,
signals[DISABLED_BOOK_LIST_UPDATED],
0);
- book_manager_clean_list_of_disabled_books (disabled_books);
+ book_manager_clean_list_of_books_disabled (books_disabled);
}
DhBookManager *
diff --git a/src/dh-util.c b/src/dh-util.c
index 85a25d6..2453c9b 100644
--- a/src/dh-util.c
+++ b/src/dh-util.c
@@ -465,25 +465,25 @@ dh_util_state_manage_paned (GtkPaned *paned,
}
GSList *
-dh_util_state_load_disabled_books (void)
+dh_util_state_load_books_disabled (void)
{
gchar *key;
- GSList *disabled_books = NULL;
+ GSList *books_disabled = NULL;
- key = util_state_get_key ("main/contents", "disabled_books");
- ige_conf_get_string_list (ige_conf_get (), key, &disabled_books);
+ key = util_state_get_key ("main/contents", "books_disabled");
+ ige_conf_get_string_list (ige_conf_get (), key, &books_disabled);
g_free(key);
- return disabled_books;
+ return books_disabled;
}
void
-dh_util_state_store_disabled_books (GSList *disabled_books)
+dh_util_state_store_books_disabled (GSList *books_disabled)
{
gchar *key;
- key = util_state_get_key ("main/contents", "disabled_books");
- ige_conf_set_string_list (ige_conf_get (), key, disabled_books);
+ key = util_state_get_key ("main/contents", "books_disabled");
+ ige_conf_set_string_list (ige_conf_get (), key, books_disabled);
g_free(key);
}
--
1.7.2.3

39
0002-Use-double-quotes-for-including-dh-headers.patch
View File

@ -1,39 +0,0 @@
From 95e1bd08872047930d5c89a63affe506f8a0f1f0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Sun, 22 Aug 2010 17:08:29 +0300
Subject: [PATCH 2/2] Use double quotes for including dh- headers
---
src/dh-base.h | 2 +-
src/dh-book-manager.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dh-base.h b/src/dh-base.h
index 6971652..56f2605 100644
--- a/src/dh-base.h
+++ b/src/dh-base.h
@@ -25,7 +25,7 @@
#include <gtk/gtk.h>
-#include <dh-book-manager.h>
+#include "dh-book-manager.h"
G_BEGIN_DECLS
diff --git a/src/dh-book-manager.h b/src/dh-book-manager.h
index 4fd3b3f..3fec290 100644
--- a/src/dh-book-manager.h
+++ b/src/dh-book-manager.h
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
-#include <dh-book.h>
+#include "dh-book.h"
G_BEGIN_DECLS
--
1.7.2.1

136
devhelp-2.90.5-gdk-key.patch
View File

@ -1,136 +0,0 @@
From 95a0a433c6ad95b42124e0874bb613ff6bb765ca Mon Sep 17 00:00:00 2001
From: Olav Vitters <olav@vitters.nl>
Date: Fri, 22 Oct 2010 11:53:12 +0200
Subject: [PATCH 1/3] Replace deprecated GDK_Escape with GDK_KEY_Escape
---
src/dh-assistant.c | 2 +-
src/eggfindbar.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dh-assistant.c b/src/dh-assistant.c
index bd19d88..05f8103 100644
--- a/src/dh-assistant.c
+++ b/src/dh-assistant.c
@@ -46,7 +46,7 @@ assistant_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
DhAssistant *assistant)
{
- if (event->keyval == GDK_Escape) {
+ if (event->keyval == GDK_KEY_Escape) {
gtk_widget_destroy (GTK_WIDGET (assistant));
return TRUE;
}
diff --git a/src/eggfindbar.c b/src/eggfindbar.c
index f6e1dba..e6daf14 100644
--- a/src/eggfindbar.c
+++ b/src/eggfindbar.c
@@ -181,7 +181,7 @@ egg_find_bar_class_init (EggFindBarClass *klass)
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"close", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
--
1.7.3.2
From 0ee886323821f82afc10beded85bbccb51f61b97 Mon Sep 17 00:00:00 2001
From: Olav Vitters <olav@vitters.nl>
Date: Fri, 22 Oct 2010 11:58:22 +0200
Subject: [PATCH 2/3] Replace deprecated GDK_* with GDK_KEY_*
---
src/dh-search.c | 6 +++---
src/dh-window.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/dh-search.c b/src/dh-search.c
index 4afd8c4..46b2e9f 100644
--- a/src/dh-search.c
+++ b/src/dh-search.c
@@ -221,7 +221,7 @@ search_entry_key_press_event_cb (GtkEntry *entry,
{
DhSearchPriv *priv = GET_PRIVATE (search);
- if (event->keyval == GDK_Tab) {
+ if (event->keyval == GDK_KEY_Tab) {
if (event->state & GDK_CONTROL_MASK) {
gtk_widget_grab_focus (priv->hitlist);
} else {
@@ -231,8 +231,8 @@ search_entry_key_press_event_cb (GtkEntry *entry,
return TRUE;
}
- if (event->keyval == GDK_Return ||
- event->keyval == GDK_KP_Enter) {
+ if (event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_KP_Enter) {
GtkTreeIter iter;
DhLink *link;
gchar *name;
diff --git a/src/dh-window.c b/src/dh-window.c
index 2fcec5f..1eacdb9 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -83,8 +83,8 @@ enum {
static gint signals[LAST_SIGNAL] = { 0 };
static guint tab_accel_keys[] = {
- GDK_1, GDK_2, GDK_3, GDK_4, GDK_5,
- GDK_6, GDK_7, GDK_8, GDK_9, GDK_0
+ GDK_KEY_1, GDK_KEY_2, GDK_KEY_3, GDK_KEY_4, GDK_KEY_5,
+ GDK_KEY_6, GDK_KEY_7, GDK_KEY_8, GDK_KEY_9, GDK_KEY_0
};
static const
--
1.7.3.2
From 9cf3860591b22d66d3dbafc750fe8b01da58013b Mon Sep 17 00:00:00 2001
From: Olav Vitters <olav@vitters.nl>
Date: Fri, 22 Oct 2010 12:00:09 +0200
Subject: [PATCH 3/3] Replace deprecated GDK_* with GDK_KEY_*
---
src/eggfindbar.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/eggfindbar.c b/src/eggfindbar.c
index e6daf14..c6d6184 100644
--- a/src/eggfindbar.c
+++ b/src/eggfindbar.c
@@ -184,22 +184,22 @@ egg_find_bar_class_init (EggFindBarClass *klass)
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"close", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0,
"scroll", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0,
"scroll", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0,
"scroll", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0,
"scroll", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0,
"scroll", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0,
"scroll", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD);
}
--
1.7.3.2

10
devhelp-gtk3.patch
View File

@ -1,10 +0,0 @@
diff -up devhelp-2.90.5/acinclude.m4.gtk3 devhelp-2.90.5/acinclude.m4
--- devhelp-2.90.5/acinclude.m4.gtk3 2010-07-14 16:30:22.970956005 -0400
+++ devhelp-2.90.5/acinclude.m4 2010-07-14 16:30:37.941955999 -0400
@@ -1,5 +1,5 @@
AC_DEFUN([IGE_PLATFORM_CHECK],[
- gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
+ gdk_target=`$PKG_CONFIG --variable=target gtk+-3.0`
if test "x$gdk_target" = "xquartz"; then
AC_MSG_CHECKING([checking for Mac OS X support])

10
devhelp-platcheck.patch
View File

@ -1,10 +0,0 @@
diff -up devhelp-2.91.4/acinclude.m4.platcheck devhelp-2.91.4/acinclude.m4
--- devhelp-2.91.4/acinclude.m4.platcheck 2011-01-09 20:52:58.824902368 -0500
+++ devhelp-2.91.4/acinclude.m4 2011-01-09 20:53:34.885902038 -0500
@@ -1,5 +1,5 @@
AC_DEFUN([IGE_PLATFORM_CHECK],[
- gdk_target=`$PKG_CONFIG --variable=target gtk+-3.0`
+ gdk_target=`$PKG_CONFIG --variable=targets gtk+-3.0`
if test "x$gdk_target" = "xquartz"; then
AC_MSG_CHECKING([checking for Mac OS X support])