Accepting request 81439 from GNOME:Factory
Pushing most of G:F OBS-URL: https://build.opensuse.org/request/show/81439 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anjuta?expand=0&rev=67
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
873e9992fb
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3a51f6db62ae103cdce92f410effe649f74895b03e68d9b35805e0239047c0fd
|
||||
size 7562985
|
||||
3
anjuta-3.1.91.tar.bz2
Normal file
3
anjuta-3.1.91.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:96f043094dce24303a6da1224d60311159b66453b8a67fc009d33c48f3f40b84
|
||||
size 7183988
|
||||
@ -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;
|
||||
@ -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
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
diff -ur anjuta-3.0.2.0/configure.ac anjuta-3.0.2.0.patched/configure.ac
|
||||
--- anjuta-3.0.2.0/configure.ac 2011-05-23 21:12:40.000000000 +0200
|
||||
+++ anjuta-3.0.2.0.patched/configure.ac 2011-06-10 21:14:30.486480081 +0200
|
||||
@@ -32,7 +32,8 @@
|
||||
GTK_REQUIRED=3.0.0
|
||||
GTHREAD_REQUIRED=2.22.0
|
||||
GDK_PIXBUF_REQUIRED=2.0.0
|
||||
-GDA_REQUIRED=4.2.0
|
||||
+GDA4_REQUIRED=4.2.0
|
||||
+GDA5_REQUIRED=4.99.0
|
||||
VTE_REQUIRED=0.27.6
|
||||
LIBXML_REQUIRED=2.4.23
|
||||
GDL_REQUIRED=2.91.4
|
||||
@@ -157,7 +158,9 @@
|
||||
[gdl-3.0 >= $GDL_REQUIRED])
|
||||
|
||||
PKG_CHECK_MODULES([GDA],
|
||||
- [libgda-4.0 >= $GDA_REQUIRED])
|
||||
+ [libgda-5.0 >= $GDA5_REQUIRED],,
|
||||
+ [PKG_CHECK_MODULES([GDA],
|
||||
+ [libgda-4.0 >= $GDA4_REQUIRED])])
|
||||
|
||||
PKG_CHECK_MODULES([VTE],
|
||||
[vte-2.90 >= $VTE_REQUIRED])
|
||||
@@ -278,8 +281,10 @@
|
||||
|
||||
AM_CONDITIONAL(HAVE_PYTHON, [test x$have_python = xyes])
|
||||
|
||||
-PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
|
||||
- [libgda-4.0 >= $GDA_REQUIRED])
|
||||
+PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
|
||||
+ [libgda-5.0 >= $GDA5_REQUIRED],,
|
||||
+ [PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
|
||||
+ [libgda-4.0 >= $GDA4_REQUIRED])])
|
||||
|
||||
dnl Setup Anjuta Library flags
|
||||
dnl --------------------------
|
||||
@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 6 09:04:24 UTC 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 3.1.91:
|
||||
+ More improvements in vala plugin
|
||||
+ Fix up problems with gtk+ 3.0
|
||||
+ Bugs fixed: bgo#638525, bgo#657491, bgo#657513, bgo#657589,
|
||||
bgo#655756, bgo#656123, bgo#657590, bgo#657022.
|
||||
- Remove unneeded call to mime-info-to-mime in %install.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 31 16:09:46 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 3.1.90:
|
||||
+ Some seldom used debugger menu items were removed
|
||||
+ A lot of fixes to the vala support
|
||||
+ vala-0.14 (>= 0.13.3) is now required
|
||||
+ Bugs fixed: bgo#656584, bgo#642187, bgo#657023, bgo#566704,
|
||||
bgo#652047, bgo#656585, bgo#657134, bgo#653259.
|
||||
- Drop anjuta-support-libgda-5.0.patch: fixed upstream.
|
||||
- Remove gnome-common BuildRequires and call to gnome-autogen.sh
|
||||
now that there is no patch requiring this.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 13 17:20:48 CEST 2011 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.1.5:
|
||||
+ Bugs fixed: bgo#654881, bgo#651151, bgo#654502, bgo#655743,
|
||||
bgo#655998, bgo#655584.
|
||||
- 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
|
||||
|
||||
|
||||
21
anjuta.spec
21
anjuta.spec
@ -18,25 +18,21 @@
|
||||
|
||||
|
||||
Name: anjuta
|
||||
Version: 3.1.4
|
||||
Version: 3.1.91
|
||||
Release: 1
|
||||
# FIXME: (should be fixed in > 3.1.91) 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.91.
|
||||
License: GPLv2+
|
||||
Summary: Versatile Integrated Development Environment for GNOME
|
||||
Url: http://anjuta.sourceforge.net/
|
||||
Group: Development/Tools/IDE
|
||||
Source: http://download.gnome.org/sources/anjuta/3.1/%{name}-%{version}.tar.bz2
|
||||
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
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gnome-doc-utils-devel
|
||||
BuildRequires: gnome-icon-theme
|
||||
BuildRequires: gobject-introspection-devel
|
||||
@ -60,10 +56,10 @@ BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(gtksourceview-3.0)
|
||||
BuildRequires: pkgconfig(libdevhelp-3.0)
|
||||
BuildRequires: pkgconfig(libgda-5.0)
|
||||
BuildRequires: pkgconfig(libgda-5.0) >= 4.99.0
|
||||
BuildRequires: pkgconfig(libgraph)
|
||||
BuildRequires: pkgconfig(libgvc)
|
||||
BuildRequires: pkgconfig(libvala-0.14)
|
||||
BuildRequires: pkgconfig(libvala-0.14) >= 0.13.3
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(neon)
|
||||
BuildRequires: pkgconfig(vte-2.90)
|
||||
@ -129,13 +125,9 @@ and more.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
translation-update-upstream
|
||||
|
||||
%build
|
||||
# Needed by patch0
|
||||
NOCONFIGURE=1 gnome-autogen.sh
|
||||
%configure\
|
||||
--disable-static \
|
||||
--disable-scrollkeeper
|
||||
@ -148,7 +140,6 @@ make %{?jobs:-j%jobs} V=1
|
||||
%endif
|
||||
# These should go to defaultdocdir.
|
||||
rm -r %{buildroot}%{_datadir}/doc
|
||||
DESTDIR=%{buildroot} mime-info-to-mime
|
||||
%suse_update_desktop_file anjuta
|
||||
%find_lang anjuta %{?no_lang_C}
|
||||
# There's no translation for those yet. If build fails because of non-packaged
|
||||
@ -156,6 +147,10 @@ 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
|
||||
# anjuta_logo is wrongly linked from help, https://bugzilla.gnome.org/show_bug.cgi?id=656470
|
||||
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}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user