diff --git a/anjuta-3.1.4.tar.bz2 b/anjuta-3.1.4.tar.bz2 deleted file mode 100644 index 201e79d..0000000 --- a/anjuta-3.1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a51f6db62ae103cdce92f410effe649f74895b03e68d9b35805e0239047c0fd -size 7562985 diff --git a/anjuta-3.1.5.tar.bz2 b/anjuta-3.1.5.tar.bz2 new file mode 100644 index 0000000..5b00b87 --- /dev/null +++ b/anjuta-3.1.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1e5927df81a7f072eaa44f21a4d48c7c052ba1c23a24ec1e4efc8173cbee189 +size 7162898 diff --git a/anjuta-gtk_hv_box.patch b/anjuta-gtk_hv_box.patch deleted file mode 100644 index 1b76260..0000000 --- a/anjuta-gtk_hv_box.patch +++ /dev/null @@ -1,214 +0,0 @@ -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-libvala-0.14.patch b/anjuta-libvala-0.14.patch deleted file mode 100644 index 2417d5c..0000000 --- a/anjuta-libvala-0.14.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: anjuta-3.1.3/configure.ac -=================================================================== ---- anjuta-3.1.3.orig/configure.ac -+++ anjuta-3.1.3/configure.ac -@@ -52,7 +52,8 @@ dnl Glade - GLADEUI_REQUIRED=3.9.2 - - dnl Vala --VALA_REQUIRED=0.11.2 -+VALA12_REQUIRED=0.11.2 -+VALA14_REQUIRED=0.13.0 - - dnl Introspection - GI_REQUIRED=0.9.5 -@@ -254,11 +255,13 @@ else - AC_MSG_RESULT(no) - enable_vala="yes" - PKG_CHECK_MODULES(VALA, -- [libvala-0.12 >= $VALA_REQUIRED]) -+ [libvala-0.14 >= $VALA14_REQUIRED],, -+ [PKG_CHECK_MODULES(VALA, -+ [libvala-0.12 >= $VALA12_REQUIRED])]) - fi - - if test x$enable_vala = xyes; then -- AC_PATH_PROGS(VALAC, [valac-0.12 valac], valac) -+ AC_PATH_PROGS(VALAC, [valac-0.14 valac-0.12 valac], valac) - AC_SUBST(VALAC) - fi - diff --git a/anjuta.changes b/anjuta.changes index 42c44a7..611f749 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Aug 13 17:20:48 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.1.5: + + bgo#654881: Segmentation fault during project creation if no + packages were selected + + bgo#651151: vala plugin crashes when uncommenting source + + bgo#654502: Allow building with libvala-0.14 (0.13 dev. tree) + + bgo#655743: Usage of GtkHBoxClass and GtkHBox + + bgo#655998: Main toolbar looks out-of-place + + bgo#655584: Can't edit Integer Field +- Drop anjuta-gtk_hv_box.patch: Fixed upstream. +- Add a hack to install anjuta_logo.png properly in the manual. + ------------------------------------------------------------------- Tue Aug 2 12:44:21 UTC 2011 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index 3e88d49..271d8dd 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -18,7 +18,8 @@ Name: anjuta -Version: 3.1.4 +Version: 3.1.5 +# FIXME: Check if the anjuta_logo.png install hack is still needed. See https://bugzilla.gnome.org/show_bug.cgi?id=656470. Last checked in version 3.1.5 Release: 1 License: GPLv2+ Summary: Versatile Integrated Development Environment for GNOME @@ -28,8 +29,6 @@ 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 @@ -130,7 +129,6 @@ and more. %prep %setup -q %patch0 -p1 -%patch1 -p1 translation-update-upstream %build @@ -156,6 +154,11 @@ DESTDIR=%{buildroot} mime-info-to-mime #%%find_lang anjuta-build-tutorial %{?no_lang_C} anjuta.lang #%%find_lang anjuta-faqs %{?no_lang_C} anjuta.lang %find_lang anjuta-manual %{?no_lang_C} anjuta.lang +# make install links the anjuta_logo wrongly around. Let's copy the file from the right location +# no worries about linking here: fdupes will do 'the right thing(tm)' for us. +for lang in %{buildroot}/%{_datadir}/gnome/help/anjuta-manual/*; do + cp --remove-destination %{buildroot}%{_datadir}/pixmaps/anjuta/anjuta_logo.png $lang/anjuta_logo.png +done find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}