From a2704857fdaa8a1aa78abfbe8fc1fcfd0fe1c008 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 14 May 2015 22:00:56 +0200 Subject: [PATCH] - initial, not ready for gedit 3.16 nor libinfinity 0.6 --- gedit-collaboration-libinfinity.patch | 50 ++++++++++++++++ gedit-collaboration.spec | 82 +++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 gedit-collaboration-libinfinity.patch create mode 100644 gedit-collaboration.spec diff --git a/gedit-collaboration-libinfinity.patch b/gedit-collaboration-libinfinity.patch new file mode 100644 index 0000000..e733e70 --- /dev/null +++ b/gedit-collaboration-libinfinity.patch @@ -0,0 +1,50 @@ +--- gedit-collaboration-3.6.1/configure.ac.orig 2013-02-24 19:37:22.000000000 +0100 ++++ gedit-collaboration-3.6.1/configure.ac 2015-05-13 18:53:32.278596386 +0200 +@@ -62,9 +62,9 @@ + PKG_CHECK_MODULES(GEDIT, [ + gedit >= $GEDIT_REQUIRED_VERSION, + gtk+-3.0 >= 3.3.15 +- libinfinity-0.5 >= $INFINITY_REQUIRED_VERSION +- libinfgtk-0.5 >= $INFINITY_REQUIRED_VERSION +- libinftextgtk-0.5 >= $INFINITY_REQUIRED_VERSION ++ libinfinity-0.6 >= $INFINITY_REQUIRED_VERSION ++ libinfgtk3-0.6 >= $INFINITY_REQUIRED_VERSION ++ libinftextgtk3-0.6 >= $INFINITY_REQUIRED_VERSION + libxml-2.0 + ]) + +#--- gedit-collaboration-3.6.1/src/gedit-collaboration.c.orig 2012-09-12 08:23:03.000000000 +0200 +#+++ gedit-collaboration-3.6.1/src/gedit-collaboration.c 2015-05-13 21:26:05.548212260 +0200 +#@@ -40,13 +40,13 @@ gedit_collaboration_get_sv (GtkWidget *w +# gdouble *sat, +# gdouble *val) +# { +#- GdkColor color; +#- GtkStyle *style; +#+ GdkRGBA color; +#+ GtkStyleContext *style; +# gdouble r, g, b; +# gdouble h; +# +#- style = gtk_widget_get_style (widget); +#- color = style->base[gtk_widget_get_state (widget)]; +#+ style = gtk_widget_get_style_context (widget); +#+ gtk_style_context_get_color(style, gtk_widget_get_state_flags (widget), &color); +# +# r = color.red / 65535.0; +# g = color.green / 65535.0; +--- gedit-collaboration-3.6.1/src/gedit-collaboration-manager.h.orig 2012-09-12 08:23:03.000000000 +0200 ++++ gedit-collaboration-3.6.1/src/gedit-collaboration-manager.h 2015-05-13 21:15:50.988238050 +0200 +@@ -60,10 +60,10 @@ GeditCollaborationManager *gedit_collabo + InfIo *io); + + InfcNotePlugin *gedit_collaboration_manager_get_note_plugin (GeditCollaborationManager *manager); +-InfcNodeRequest *gedit_collaboration_manager_subscribe (GeditCollaborationManager *manager, ++InfRequest *gedit_collaboration_manager_subscribe (GeditCollaborationManager *manager, + GeditCollaborationUser *user, + InfcBrowser *browser, +- const InfcBrowserIter *iter); ++ const InfRequestResult *iter); + + void gedit_collaboration_manager_clear_colors (GeditCollaborationManager *manager, + GeditTab *tab); diff --git a/gedit-collaboration.spec b/gedit-collaboration.spec new file mode 100644 index 0000000..6e71586 --- /dev/null +++ b/gedit-collaboration.spec @@ -0,0 +1,82 @@ +# NOTE: needs more fixes for libinfinity 0.6.x; doesn't build with gedit 3.16 +Summary: GEdit plugin providing support for collaborative editing +Summary(pl.UTF-8): Wtyczka GEdita z obsługą edycji grupowej +Name: gedit-collaboration +Version: 3.6.1 +Release: 0.1 +License: GPL v3+ +Group: X11/Applications/Editors +Source0: http://ftp.gnome.org/pub/GNOME/sources/gedit-collaboration/3.6/%{name}-%{version}.tar.xz +# Source0-md5: c6e3aa8b41798586d8d46ff837b0871b +Patch0: %{name}-libinfinity.patch +URL: https://git.gnome.org/browse/gedit-collaboration/ +BuildRequires: autoconf >= 2.64 +BuildRequires: automake >= 1:1.11 +BuildRequires: gedit-devel >= 3.6 +# uses some APIs removed later +BuildRequires: gedit-devel < 3.8 +BuildRequires: gettext-tools >= 0.17 +BuildRequires: gtk+3-devel >= 3.4 +BuildRequires: intltool >= 0.41.0 +BuildRequires: libinfinity-devel >= 0.5 +BuildRequires: libinfinity-gtk3-devel >= 0.5 +BuildRequires: libtool >= 2:2.2 +BuildRequires: libxml2-devel >= 2.0 +BuildRequires: pkgconfig +BuildRequires: tar >= 1:1.22 +BuildRequires: xz +Requires(post,postun): glib2 >= 1:2.26 +Requires: gedit >= 3.6 +Requires: gtk+3 >= 3.4 +Requires: libinfinity >= 0.5 +Requires: libinfinity-gtk3 >= 0.5 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +GEdit plugin providing support for collaborative editing. + +%description -l pl.UTF-8 +Wtyczka GEdita z obsługą edycji grupowej. + +%prep +%setup -q +#%patch0 -p1 + +%build +%{__intltoolize} +%{__libtoolize} +%{__aclocal} -I m4 +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + --disable-silent-rules \ + --disable-static +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.la + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%glib_compile_schemas + +%postun +%glib_compile_schemas + +%files -f %{name}.lang +%defattr(644,root,root,755) +%doc NEWS README +%{_libdir}/gedit/plugins/collaboration.plugin +%attr(755,root,root) %{_libdir}/gedit/plugins/libcollaboration.so +%{_datadir}/gedit/plugins/collaboration +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.collaboration.gschema.xml -- 2.43.0