From 8c5b0b26dab3da042bbe4882096c98669ce8bac6 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Feb 07 2016 19:51:20 +0000 Subject: update to 1.13.0 release --- diff --git a/pluma.spec b/pluma.spec index 70e3dbb..ca6c900 100644 --- a/pluma.spec +++ b/pluma.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.12 +%global branch 1.13 # Settings used for build from snapshots. %{!?rel_build:%global commit c1ca209172a8b3a0751ac0a1e2dbec33c1894290} @@ -14,9 +14,9 @@ Summary: Text editor for the MATE desktop Name: pluma -Version: %{branch}.1 +Version: %{branch}.0 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 1%{?dist} %else Release: 0.2%{?git_rel}%{?dist} %endif @@ -31,7 +31,9 @@ URL: http://mate-desktop.org %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} # disable non working python plugins for gtk3 -Patch1: pluma_diasable-python-plugins.patch +Patch0: pluma_diasable-python-plugins.patch +# http://git.mate-desktop.org/pluma/commit/?id=1b313dd +Patch1: pluma_add-style-classes.patch BuildRequires: desktop-file-utils BuildRequires: enchant-devel @@ -99,10 +101,12 @@ Obsoletes: mate-text-editor-devel < %{version}-%{release} %description devel Development files for mate-text-editor + %prep %setup -q%{!?rel_build:n %{name}-%{commit}} -%patch1 -p1 -b .diasable-python-plugins +%patch0 -p1 -b .diasable-python-plugins +%patch1 -p1 -b .style-classes NOCONFIGURE=1 ./autogen.sh @@ -118,7 +122,6 @@ NOCONFIGURE=1 ./autogen.sh find ./*/* -type f -exec chmod 644 {} \; find ./*/*/* -type f -exec chmod 644 {} \; - %build %configure \ --disable-static \ @@ -183,6 +186,7 @@ fi %{_datadir}/glib-2.0/schemas/org.mate.pluma.gschema.xml %{_datadir}/glib-2.0/schemas/org.mate.pluma.plugins.filebrowser.gschema.xml %{_datadir}/glib-2.0/schemas/org.mate.pluma.plugins.time.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.pluma.plugins.spell.gschema.xml %files data -f %{name}.lang %doc README COPYING AUTHORS @@ -196,6 +200,9 @@ fi %changelog +* Sun Feb 07 2016 Wolfgang Ulbrich - 1.13.0-1 +- update to 1.13.0 release + * Thu Feb 04 2016 Fedora Release Engineering - 1.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/pluma_add-style-classes.patch b/pluma_add-style-classes.patch new file mode 100644 index 0000000..89a4684 --- /dev/null +++ b/pluma_add-style-classes.patch @@ -0,0 +1,42 @@ +From 1b313dd645030fc18dd37817a02705c41dde571e Mon Sep 17 00:00:00 2001 +From: Wolfgang Ulbrich +Date: Sat, 06 Feb 2016 02:50:04 +0000 +Subject: GTK+3: add style class pluma-window and pluma-print-preview + +--- +diff --git a/pluma/pluma-print-preview.c b/pluma/pluma-print-preview.c +index ab111b6..5a54e7f 100644 +--- a/pluma/pluma-print-preview.c ++++ b/pluma/pluma-print-preview.c +@@ -1006,6 +1006,10 @@ pluma_print_preview_init (PlumaPrintPreview *preview) + priv->gtk_preview = NULL; + + #if GTK_CHECK_VERSION (3, 0, 0) ++ GtkStyleContext *context; ++ ++ context = gtk_widget_get_style_context (GTK_WIDGET (preview)); ++ gtk_style_context_add_class (context, "pluma-print-preview"); + gtk_orientable_set_orientation (GTK_ORIENTABLE (preview), + GTK_ORIENTATION_VERTICAL); + #endif +diff --git a/pluma/pluma-window.c b/pluma/pluma-window.c +index 15111e5..23cdcae 100644 +--- a/pluma/pluma-window.c ++++ b/pluma/pluma-window.c +@@ -3843,6 +3843,13 @@ pluma_window_init (PlumaWindow *window) + window->priv->window_group = gtk_window_group_new (); + gtk_window_group_add_window (window->priv->window_group, GTK_WINDOW (window)); + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ GtkStyleContext *context; ++ ++ context = gtk_widget_get_style_context (GTK_WIDGET (window)); ++ gtk_style_context_add_class (context, "pluma-window"); ++#endif ++ + main_box = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (window), main_box); + gtk_widget_show (main_box); +-- +cgit + diff --git a/pluma_option-to-disable-dep-to-mate-desktop.patch b/pluma_option-to-disable-dep-to-mate-desktop.patch deleted file mode 100644 index 9b48775..0000000 --- a/pluma_option-to-disable-dep-to-mate-desktop.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -upr pluma/configure.ac pluma-test/configure.ac ---- pluma/configure.ac 2015-11-18 13:01:06.568533069 +0100 -+++ pluma-test/configure.ac 2015-11-18 13:36:54.291063147 +0100 -@@ -182,7 +182,6 @@ PKG_CHECK_MODULES(PLUMA, [ - gio-2.0 >= 2.26.0 - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED - gtksourceview-$GTK_API_VERSION >= 2.9.7 -- mate-desktop-2.0 >= 1.9.0 - ]) - - PKG_CHECK_MODULES(X11, [x11]) -@@ -199,6 +198,25 @@ AC_SUBST(EGG_SMCLIENT_CFLAGS) - AC_SUBST(EGG_SMCLIENT_LIBS) - - dnl ================================================================ -+dnl Mate-desktop support -+dnl ================================================================ -+ -+MATEDESKTOP_REQUIRED=1.9.0 -+ -+AC_ARG_WITH(matedesktop, -+ [AS_HELP_STRING([--without-matedesktop], -+ [Disable the use of matedesktop])], -+ [], -+ [with_matedesktop=yes]) -+ -+AM_CONDITIONAL([WITH_MATEDESKTOP],[test "$with_matedesktop" = "yes"]) -+ -+if test "$with_matedesktop" = "yes"; then -+ PKG_CHECK_MODULES([SHELL_CORE], mate-desktop-2.0 >= $MATEDESKTOP_REQUIRED) -+ AC_DEFINE([WITH_MATEDESKTOP],[1],[Define if mate-desktop support is enabled]) -+fi -+ -+dnl ================================================================ - dnl GSettings related settings - dnl ================================================================ - -@@ -420,6 +438,7 @@ Configuration: - Source code location: ${srcdir} - Compiler: ${CC} - GTK API version: $GTK_API_VERSION -+ MATE desktop Support: $with_matedesktop - Python Plugins Support: $enable_python - Spell Plugin enabled: $enable_enchant - Gvfs metadata enabled: $enable_gvfs_metadata -diff -upr pluma/pluma/pluma-commands-help.c pluma-test/pluma/pluma-commands-help.c ---- pluma/pluma/pluma-commands-help.c 2015-11-18 13:01:07.417541605 +0100 -+++ pluma-test/pluma/pluma-commands-help.c 2015-11-18 13:18:49.474206961 +0100 -@@ -37,7 +37,9 @@ - - #include - #include -+#ifdef WITH_MATEDESKTOP - #include -+#endif - - #include "pluma-commands.h" - #include "pluma-debug.h" -@@ -85,8 +87,13 @@ void _pluma_cmd_help_about(GtkAction* ac - - pluma_debug (DEBUG_COMMANDS); - -+#ifdef WITH_MATEDESKTOP - mate_show_about_dialog(GTK_WINDOW(window), -+#else -+ gtk_show_about_dialog(GTK_WINDOW(window), -+#endif - "program-name", "Pluma", -+ - "authors", authors, - "comments", _(comments), - "copyright", copyright,