From 32ad34b63f8bb74bdf0b9eee6b86dce994b64009 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 2 Aug 2011 15:11:56 +0000 Subject: [PATCH] Accepting request 77684 from home:dimstar:branches:GNOME:Apps This is the needed fix on top of anjuta to make gtkpod succeed. OBS-URL: https://build.opensuse.org/request/show/77684 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=96 --- anjuta-gtk_hv_box.patch | 214 ++++++++++++++++++++++++++++++++++++++++ anjuta.changes | 6 ++ anjuta.spec | 3 + 3 files changed, 223 insertions(+) create mode 100644 anjuta-gtk_hv_box.patch diff --git a/anjuta-gtk_hv_box.patch b/anjuta-gtk_hv_box.patch new file mode 100644 index 0000000..1b76260 --- /dev/null +++ b/anjuta-gtk_hv_box.patch @@ -0,0 +1,214 @@ +diff -ur anjuta-3.1.4/libanjuta/anjuta-column-text-view.h anjuta-3.1.4.patched/libanjuta/anjuta-column-text-view.h +--- anjuta-3.1.4/libanjuta/anjuta-column-text-view.h 2011-02-24 13:10:43.000000000 +0100 ++++ anjuta-3.1.4.patched/libanjuta/anjuta-column-text-view.h 2011-08-02 14:39:54.112092160 +0200 +@@ -39,12 +39,12 @@ + + struct _AnjutaColumnTextViewClass + { +- GtkVBoxClass parent_class; ++ GtkBoxClass parent_class; + }; + + struct _AnjutaColumnTextView + { +- GtkVBox parent_instance; ++ GtkBox parent_instance; + + AnjutaColumnTextViewPriv *priv; + }; +diff -ur anjuta-3.1.4/libanjuta/anjuta-file-list.h anjuta-3.1.4.patched/libanjuta/anjuta-file-list.h +--- anjuta-3.1.4/libanjuta/anjuta-file-list.h 2010-11-26 12:15:52.000000000 +0100 ++++ anjuta-3.1.4.patched/libanjuta/anjuta-file-list.h 2011-08-02 14:39:54.132092426 +0200 +@@ -39,12 +39,12 @@ + + struct _AnjutaFileListClass + { +- GtkVBoxClass parent_class; ++ GtkBoxClass parent_class; + }; + + struct _AnjutaFileList + { +- GtkVBox parent_instance; ++ GtkBox parent_instance; + + AnjutaFileListPriv *priv; + }; +diff -ur anjuta-3.1.4/libanjuta/anjuta-status.h anjuta-3.1.4.patched/libanjuta/anjuta-status.h +--- anjuta-3.1.4/libanjuta/anjuta-status.h 2010-11-08 16:57:37.000000000 +0100 ++++ anjuta-3.1.4.patched/libanjuta/anjuta-status.h 2011-08-02 14:39:54.184093117 +0200 +@@ -37,13 +37,13 @@ + + struct _AnjutaStatus + { +- GtkHBox parent; ++ GtkBox parent; + AnjutaStatusPriv *priv; + }; + + struct _AnjutaStatusClass + { +- GtkHBoxClass parent_class; ++ GtkBoxClass parent_class; + + /* signals */ + void (*busy) (AnjutaStatus *status, gboolean state); +diff -ur anjuta-3.1.4/plugins/class-gen/combo-flags.c anjuta-3.1.4.patched/plugins/class-gen/combo-flags.c +--- anjuta-3.1.4/plugins/class-gen/combo-flags.c 2010-11-19 18:14:02.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/class-gen/combo-flags.c 2011-08-02 14:41:18.205209505 +0200 +@@ -71,7 +71,7 @@ + LAST_SIGNAL + }; + +-static GtkHBoxClass* parent_class = NULL; ++static GtkBoxClass* parent_class = NULL; + static guint combo_flags_signals[LAST_SIGNAL]; + + static CgComboFlagsCellInfo * +diff -ur anjuta-3.1.4/plugins/class-gen/combo-flags.h anjuta-3.1.4.patched/plugins/class-gen/combo-flags.h +--- anjuta-3.1.4/plugins/class-gen/combo-flags.h 2010-11-08 16:57:37.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/class-gen/combo-flags.h 2011-08-02 14:40:21.604457522 +0200 +@@ -58,12 +58,12 @@ + + struct _CgComboFlagsClass + { +- GtkHBoxClass parent_class; ++ GtkBoxClass parent_class; + }; + + struct _CgComboFlags + { +- GtkHBox parent_instance; ++ GtkBox parent_instance; + }; + + typedef enum _CgComboFlagsSelectionType +diff -ur anjuta-3.1.4/plugins/document-manager/search-box.h anjuta-3.1.4.patched/plugins/document-manager/search-box.h +--- anjuta-3.1.4/plugins/document-manager/search-box.h 2011-03-03 16:28:01.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/document-manager/search-box.h 2011-08-02 14:40:32.524602627 +0200 +@@ -42,12 +42,12 @@ + + struct _SearchBoxClass + { +- GtkHBoxClass parent_class; ++ GtkBoxClass parent_class; + }; + + struct _SearchBox + { +- GtkHBox parent_instance; ++ GtkBox parent_instance; + + GtkWidget* new; + }; +diff -ur anjuta-3.1.4/plugins/git/git-repository-selector.h anjuta-3.1.4.patched/plugins/git/git-repository-selector.h +--- anjuta-3.1.4/plugins/git/git-repository-selector.h 2010-11-26 12:15:53.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/git/git-repository-selector.h 2011-08-02 14:42:42.322326527 +0200 +@@ -39,12 +39,12 @@ + + struct _GitRepositorySelectorClass + { +- GtkVBoxClass parent_class; ++ GtkBoxClass parent_class; + }; + + struct _GitRepositorySelector + { +- GtkVBox parent_instance; ++ GtkBox parent_instance; + + GitRepositorySelectorPriv *priv; + }; +diff -ur anjuta-3.1.4/plugins/message-view/message-view.h anjuta-3.1.4.patched/plugins/message-view/message-view.h +--- anjuta-3.1.4/plugins/message-view/message-view.h 2010-11-08 16:57:37.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/message-view/message-view.h 2011-08-02 14:40:47.524801929 +0200 +@@ -48,7 +48,7 @@ + + struct _MessageView + { +- GtkHBox parent; ++ GtkBox parent; + + /* private */ + MessageViewPrivate* privat; +@@ -56,7 +56,7 @@ + + struct _MessageViewClass + { +- GtkHBoxClass parent; ++ GtkBoxClass parent; + }; + + typedef enum +diff -ur anjuta-3.1.4/plugins/snippets-manager/snippets-browser.c anjuta-3.1.4.patched/plugins/snippets-manager/snippets-browser.c +--- anjuta-3.1.4/plugins/snippets-manager/snippets-browser.c 2011-03-03 16:28:01.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/snippets-manager/snippets-browser.c 2011-08-02 14:42:42.322326527 +0200 +@@ -48,7 +48,7 @@ + + GtkWidget *grip; + +- GtkVBox *snippets_view_vbox; ++ GtkBox *snippets_view_vbox; + GtkScrolledWindow *snippets_view_cont; + + GtkWidget *browser_hpaned; +diff -ur anjuta-3.1.4/plugins/snippets-manager/snippets-browser.h anjuta-3.1.4.patched/plugins/snippets-manager/snippets-browser.h +--- anjuta-3.1.4/plugins/snippets-manager/snippets-browser.h 2010-11-08 16:57:37.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/snippets-manager/snippets-browser.h 2011-08-02 14:41:04.677029800 +0200 +@@ -44,7 +44,7 @@ + + struct _SnippetsBrowser + { +- GtkHBox parent; ++ GtkBox parent; + + gboolean show_only_document_language_snippets; + AnjutaShell *anjuta_shell; +@@ -55,7 +55,7 @@ + + struct _SnippetsBrowserClass + { +- GtkHBoxClass parent_class; ++ GtkBoxClass parent_class; + + /* Signals */ + void (*maximize_request) (SnippetsBrowser *snippets_browser); +diff -ur anjuta-3.1.4/plugins/snippets-manager/snippets-editor.h anjuta-3.1.4.patched/plugins/snippets-manager/snippets-editor.h +--- anjuta-3.1.4/plugins/snippets-manager/snippets-editor.h 2010-11-08 16:57:37.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/snippets-manager/snippets-editor.h 2011-08-02 14:41:18.201209452 +0200 +@@ -42,7 +42,7 @@ + + struct _SnippetsEditor + { +- GtkHBox parent; ++ GtkBox parent; + + /*< private >*/ + SnippetsEditorPrivate *priv; +@@ -50,7 +50,7 @@ + + struct _SnippetsEditorClass + { +- GtkHBoxClass parent_class; ++ GtkBoxClass parent_class; + + /* Signals */ + void (*snippet_saved) (SnippetsEditor *snippets_editor, +diff -ur anjuta-3.1.4/plugins/sourceview/sourceview.h anjuta-3.1.4.patched/plugins/sourceview/sourceview.h +--- anjuta-3.1.4/plugins/sourceview/sourceview.h 2010-11-08 16:57:37.000000000 +0100 ++++ anjuta-3.1.4.patched/plugins/sourceview/sourceview.h 2011-08-02 14:42:42.318326473 +0200 +@@ -43,12 +43,12 @@ + typedef struct SourceviewPrivate SourceviewPrivate; + + typedef struct { +- GtkVBox parent; ++ GtkBox parent; + SourceviewPrivate *priv; + } Sourceview; + + typedef struct { +- GtkVBoxClass parent_class; ++ GtkBoxClass parent_class; + void (*update_ui); + + } SourceviewClass; diff --git a/anjuta.changes b/anjuta.changes index 0791959..42c44a7 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 2 12:44:21 UTC 2011 - dimstar@opensuse.org + +- Add anjuta-gtk_hv_box.patch: Stop using deprectaed GtkHBox and + GtkVBox. + ------------------------------------------------------------------- Mon Jul 25 14:54:18 CEST 2011 - vuntz@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index bd79169..3e88d49 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -28,6 +28,8 @@ Source: http://download.gnome.org/sources/anjuta/3.1/%{name}-%{version}. Source1: %{name}-rpmlintrc # PATCH-FEATURE-UPSTREAM anjuta-support-libgda-5.0.patch bgo#652047 dimstar@opensuse.org -- Also support building with libgda-5.0. Patch0: anjuta-support-libgda-5.0.patch +# PATCH-FIX-UPSTREAM anjuta-gtk_hv_box.patch bgo#655743 dimstar@opensuse.org -- Stop using deprecated GtkHBox and GtkVBox. +Patch1: anjuta-gtk_hv_box.patch BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: bison @@ -128,6 +130,7 @@ and more. %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream %build