!13 remove patch

From: @longcheng01 Reviewed-by: @tangjie02 Signed-off-by: @tangjie02
remove patches
2022-08-12 02:21:05 +00:00 · 2022-08-08 15:11:41 +08:00 · 2022-08-05 07:11:18 +00:00 · 2022-08-04 16:56:19 +08:00 · 2022-07-15 02:13:18 +00:00 · 2022-07-06 14:54:11 +08:00
5 changed files with 793 additions and 0 deletions
--- a/0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch
+++ b/0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch
@ -0,0 +1,46 @@
+From 49944cb7e9cda0a56e4e0c367e73d025b1e20983 Mon Sep 17 00:00:00 2001
+From: longcheng <longcheng@kylinos.com.cn>
+Date: Thu, 24 Mar 2022 18:53:11 +0800
+Subject: [PATCH 0/5] change workspace titlebar and font and composite
+
+---
+ configure                      | 2 +-
+ src/org.mate.marco.gschema.xml | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index f89f5be..3135a6e 100755
+--- a/configure
+++ b/configure
+@@ -14897,7 +14897,7 @@ fi
+ if test x$have_xcomposite = xyes; then
+   MARCO_PC_MODULES="$MARCO_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
+ 
+-$as_echo "#define HAVE_COMPOSITE_EXTENSIONS 1" >>confdefs.h
+$as_echo "#define HAVE_COMPOSITE_EXTENSIONS 0" >>confdefs.h
+ 
+   echo "Building with compositing manager"
+ 
+diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
+index 6632e6b..afd64b8 100644
+--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
+@@ -116,13 +116,13 @@
+       <description>If true, ignore the titlebar_font option, and use the standard application font for window titles.</description>
+     </key>
+     <key name="titlebar-font" type="s">
+-      <default>'Sans Bold 10'</default>
+      <default>'Noto Sans CJK SC Regular 9'</default>
+       <summary>Window title font</summary>
+       <description>A font description string describing a font for window titlebars. The size from the description will only be used if the titlebar_font_size option is set to 0. Also, this option is disabled if the titlebar_uses_desktop_font option is set to true.</description>
+     </key>
+     <key name="num-workspaces" type="i">
+       <range min="1" max="36"/>
+-      <default>4</default>
+      <default>2</default>
+       <summary>Number of workspaces</summary>
+       <description>Number of workspaces. Must be more than zero, and has a fixed maximum to prevent making the desktop unusable by accidentally asking for too many workspaces.</description>
+     </key>
+-- 
+2.27.0
+
--- a/0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch
+++ b/0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch
@ -0,0 +1,25 @@
+From b638cc7c8bb7cfb9d61ae85e3ad00b3cfd1ec884 Mon Sep 17 00:00:00 2001
+From: longcheng <longcheng@kylinos.com.cn>
+Date: Thu, 24 Mar 2022 18:54:48 +0800
+Subject: [PATCH 1/5] fix: disabled Alt+F1 to popop mate menu
+
+---
+ src/org.mate.marco.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
+index afd64b8..94f63b4 100644
+--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
+@@ -603,7 +603,7 @@
+       <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
+     </key>
+     <key name="panel-main-menu" type="s">
+-      <default>'&lt;Alt&gt;F1'</default>
+      <default>'disabled'</default>
+       <summary>Show the panel's main menu</summary>
+       <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
+     </key>
+-- 
+2.27.0
+
--- a/0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch
+++ b/0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch
@ -0,0 +1,179 @@
+From bf212ac737d114d639457802ce8b1363a465c7a3 Mon Sep 17 00:00:00 2001
+From: longcheng <longcheng@kylinos.com.cn>
+Date: Thu, 24 Mar 2022 18:58:13 +0800
+Subject: [PATCH 2/5] feature[menu] : pop up start menu when press super key
+
+---
+ po/zh_CN.po                     |  3 +++
+ src/50-marco-desktop-key.xml.in |  2 ++
+ src/core/atomnames.h            |  1 +
+ src/core/keybindings.c          | 48 +++++++++++++++++++++++++++++++++
+ src/include/all-keybindings.h   |  2 ++
+ src/include/prefs.h             |  3 ++-
+ src/org.mate.marco.gschema.xml  |  5 ++++
+ src/ui/ui.c                     |  8 ++++++
+ 8 files changed, 71 insertions(+), 1 deletion(-)
+
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index ad1d1eb..4399cda 100644
+--- a/po/zh_CN.po
+++ b/po/zh_CN.po
+@@ -42,6 +42,9 @@ msgstr "显示面板的“运行应用程序”对话框"
+ msgid "Show the panel's main menu"
+ msgstr "显示面板主菜单"
+ 
+msgid "Show the panel's main menu of kiran"
+msgstr "显示开始菜单"
+
+ #: ../src/50-marco-desktop-key.xml.in.h:4
+ #: ../src/org.mate.marco.gschema.xml.h:101
+ msgid "Take a screenshot"
+diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in
+index 219109e..1719291 100644
+--- a/src/50-marco-desktop-key.xml.in
+++ b/src/50-marco-desktop-key.xml.in
+@@ -5,6 +5,8 @@
+ 
+ 	<KeyListEntry name="panel-main-menu" _description="Show the panel's main menu" />
+ 
+	<KeyListEntry name="panel-kiran-menu" _description="Show the panel's main menu of kiran" />
+
+ 	<KeyListEntry name="run-command-screenshot" _description="Take a screenshot" />
+ 
+ 	<KeyListEntry name="run-command-window-screenshot" _description="Take a screenshot of a window" />
+diff --git a/src/core/atomnames.h b/src/core/atomnames.h
+index 3744f42..48582aa 100644
+--- a/src/core/atomnames.h
+++ b/src/core/atomnames.h
+@@ -64,6 +64,7 @@ item(_GTK_SHOW_WINDOW_MENU)
+ item(_MATE_PANEL_ACTION)
+ item(_MATE_PANEL_ACTION_MAIN_MENU)
+ item(_MATE_PANEL_ACTION_RUN_DIALOG)
+item(_MATE_PANEL_ACTION_KIRAN_MENU)
+ item(_MARCO_SENTINEL)
+ item(_MARCO_VERSION)
+ item(WM_CLIENT_MACHINE)
+diff --git a/src/core/keybindings.c b/src/core/keybindings.c
+index 83ff985..542c89f 100644
+--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
+@@ -2917,6 +2917,54 @@ handle_panel (MetaDisplay    *display,
+   meta_error_trap_pop (display, FALSE);
+ }
+ 
+static void
+handle_kiran_panel (MetaDisplay    *display,
+                           MetaScreen     *screen,
+                           MetaWindow     *window,
+                           XEvent         *event,
+                           MetaKeyBinding *binding)
+  {
+    /*MetaKeyBindingAction action = binding->handler->data;*/
+    MetaKeyBindingAction action = META_KEYBINDING_ACTION_KIRAN_PANEL_MENU;
+    Atom action_atom;
+    XClientMessageEvent ev;
+  
+    action_atom = None;
+    switch (action)
+      {
+      /* FIXME: The numbers are wrong */
+      case META_KEYBINDING_ACTION_KIRAN_PANEL_MENU:
+        action_atom = display->atom__MATE_PANEL_ACTION_KIRAN_MENU;
+        break;
+      default:
+        return;
+      }
+  
+    ev.type = ClientMessage;
+    ev.window = screen->xroot;
+    ev.message_type = display->atom__MATE_PANEL_ACTION;
+    ev.format = 32;
+    ev.data.l[0] = action_atom;
+    ev.data.l[1] = event->xkey.time;
+  
+    meta_topic (META_DEBUG_KEYBINDINGS,
+                "Sending panel message with timestamp %lu, and turning mouse_mode "
+                "off due to keybinding press\n", event->xkey.time);
+    display->mouse_mode = FALSE;
+  
+    meta_error_trap_push (display);
+  
+    /* Release the grab for the panel before sending the event */
+    XUngrabKeyboard (display->xdisplay, event->xkey.time);
+    XSendEvent (display->xdisplay,
+  	      screen->xroot,
+  	      False,
+  	      StructureNotifyMask,
+  	      (XEvent*) &ev);
+  
+    meta_error_trap_pop (display, FALSE);
+}
+
+ static void
+ handle_activate_window_menu (MetaDisplay    *display,
+                       MetaScreen     *screen,
+diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
+index cba8e9f..a7ade33 100644
+--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
+@@ -154,6 +154,8 @@ keybind (show-desktop, handle_show_desktop, 0, 0)
+ keybind (panel-main-menu, handle_panel, META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0)
+ keybind (panel-run-dialog, handle_panel, META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, 0)
+ 
+keybind (panel-kiran-menu, handle_kiran_panel, META_KEYBINDING_ACTION_KIRAN_PANEL_MENU, 0)
+
+ /* Yes, the param is offset by one.  Historical reasons.  (Maybe worth fixing
+  * at some point.)  The description is NULL here because the stanza is
+  * irregularly shaped in marco.schemas.in.  This will probably be fixed
+diff --git a/src/include/prefs.h b/src/include/prefs.h
+index 34ab802..eda0693 100644
+--- a/src/include/prefs.h
+++ b/src/include/prefs.h
+@@ -205,7 +205,8 @@ typedef enum _MetaKeyBindingAction
+   META_KEYBINDING_ACTION_COMMAND_9,
+   META_KEYBINDING_ACTION_COMMAND_10,
+   META_KEYBINDING_ACTION_COMMAND_11,
+-  META_KEYBINDING_ACTION_COMMAND_12
+  META_KEYBINDING_ACTION_COMMAND_12,
+  META_KEYBINDING_ACTION_KIRAN_PANEL_MENU
+ } MetaKeyBindingAction;
+ 
+ typedef struct
+diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
+index 94f63b4..5716af3 100644
+--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
+@@ -607,6 +607,11 @@
+       <summary>Show the panel's main menu</summary>
+       <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
+     </key>
+    <key name="panel-kiran-menu" type="s">
+      <default>'&lt;Super&gt;'</default>
+      <summary>Show the panel's main menu of kiran</summary>
+      <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
+    </key>
+     <key name="panel-run-dialog" type="s">
+       <default>'&lt;Alt&gt;F2'</default>
+       <summary>Show the panel's "Run Application" dialog box</summary>
+diff --git a/src/ui/ui.c b/src/ui/ui.c
+index ed2c577..ddfa9bc 100644
+--- a/src/ui/ui.c
+++ b/src/ui/ui.c
+@@ -772,6 +772,14 @@ meta_ui_parse_accelerator (const char          *accel,
+     return TRUE;
+ 
+   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
+  if(gdk_mask & GDK_SUPER_MASK)
+  {	
+	unsigned char super_L_keycode=0;
+	Display *display = XOpenDisplay(NULL);
+	super_L_keycode = XKeysymToKeycode(display , XK_Super_L);
+	gdk_code = super_L_keycode;
+	gdk_mask = 0;
+  }
+   if (gdk_mask == 0 && gdk_sym == 0 && gdk_code == 0)
+     return FALSE;
+ 
+-- 
+2.27.0
+
--- a/marco-1.22.3.tar.xz
+++ b/marco-1.22.3.tar.xz
--- a/marco.spec
+++ b/marco.spec
@ -0,0 +1,543 @@
+# Conditional for release and snapshot builds. Uncomment for release-builds.
+%global rel_build 1
+
+# This is needed, because src-url contains branched part of versioning-scheme.
+%global branch 1.22
+
+# Settings used for build from snapshots.
+%{!?rel_build:%global commit 62a708d461e08275d6b85985f5fa13fa8fbc85f7}
+%{!?rel_build:%global commit_date 20131212}
+%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
+%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}}
+%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}}
+%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
+
+Name:          marco
+Version:       %{branch}.3
+%if 0%{?rel_build}
+Release:       4
+%else
+Release:       0.12%{?git_rel}
+%endif
+Summary:       MATE Desktop window manager
+License:       LGPLv2+ and GPLv2+
+URL:           http://mate-desktop.org
+
+# for downloading the tarball use 'spectool -g -R marco.spec'
+# Source for release-builds.
+%{?rel_build:Source0:     http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}
+# Source for snapshot-builds.
+%{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
+
+Patch0:    0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch
+Patch1:    0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch
+Patch2:    0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch
+
+BuildRequires: desktop-file-utils
+BuildRequires: gtk3-devel
+BuildRequires: libcanberra-devel
+BuildRequires: libgtop2-devel
+BuildRequires: libSM-devel
+BuildRequireS: libsoup-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXpresent-devel
+BuildRequires: mate-common
+BuildRequires: mate-desktop-devel
+BuildRequires: zenity
+BuildRequires: startup-notification-devel
+BuildRequires: yelp-tools
+
+Requires:      mate-desktop-libs
+Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
+
+# http://bugzilla.redhat.com/873342
+# https://bugzilla.redhat.com/962009
+Provides: firstboot(windowmanager) = marco
+
+%description
+MATE Desktop window manager
+
+# to avoid that marco will install in other DE's by compiz-0.8.10
+%package libs
+Summary:       Libraries for marco
+License:       LGPLv2+
+
+%description libs
+This package provides Libraries for marco.
+
+%package devel
+Summary:       Development files for marco
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description devel
+Development files for marco
+
+
+%prep
+%if 0%{?rel_build}
+%autosetup -p1
+%else
+%autosetup -n %{name}-%{commit} -p1
+%endif
+
+%if 0%{?rel_build}
+#NOCONFIGURE=1 ./autogen.sh
+%else # 0%{?rel_build}
+# needed for git snapshots
+NOCONFIGURE=1 ./autogen.sh
+%endif # 0%{?rel_build}
+
+%build
+%configure --disable-static           \
+           --disable-schemas-compile  \
+           --with-x
+
+# fix rpmlint unused-direct-shlib-dependency warning
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
+
+make %{?_smp_mflags} V=1
+
+
+%install
+%{make_install}
+
+find %{buildroot} -name '*.la' -exec rm -vf {} ';'
+
+desktop-file-install                                \
+        --delete-original                           \
+        --dir=%{buildroot}%{_datadir}/applications  \
+%{buildroot}%{_datadir}/applications/marco.desktop
+
+%find_lang %{name} --with-gnome --all-name
+
+
+%files
+%doc AUTHORS COPYING README ChangeLog
+%{_bindir}/marco
+%{_bindir}/marco-message
+%{_bindir}/marco-theme-viewer
+%{_datadir}/applications/marco.desktop
+%{_datadir}/themes/ClearlooksRe
+%{_datadir}/themes/Dopple-Left
+%{_datadir}/themes/Dopple
+%{_datadir}/themes/DustBlue
+%{_datadir}/themes/Spidey-Left
+%{_datadir}/themes/Spidey
+%{_datadir}/themes/Splint-Left
+%{_datadir}/themes/Splint
+%{_datadir}/themes/WinMe
+%{_datadir}/themes/eOS
+%dir %{_datadir}/marco
+%dir %{_datadir}/marco/icons
+%{_datadir}/marco/icons/marco-window-demo.png
+%{_datadir}/mate-control-center/keybindings/50-marco*.xml
+%{_datadir}/mate/wm-properties
+%{_mandir}/man1/*
+
+%files libs -f %{name}.lang
+%{_libdir}/libmarco-private.so.2*
+%{_datadir}/glib-2.0/schemas/org.mate.marco.gschema.xml
+
+%files devel
+%{_bindir}/marco-window-demo
+%{_includedir}/marco-1
+%{_libdir}/libmarco-private.so
+%{_libdir}/pkgconfig/libmarco-private.pc
+%{_mandir}/man1/marco-theme-viewer.1.*
+%{_mandir}/man1/marco-window-demo.1.*
+
+
+%changelog
+* Wed Jul 06 2022 longcheng <longcheng@kylinos.com.cn> - 1.22.3-4
+- KYOS-F: changed number of workspace to 2; set marco compositor to 0; changed title-bar font to 'Noto Sans CJK SC Regular'
+- KYOS-F: fix: disabled Alt+F1 to popop mate menu  Related #28275
+- KYOS-F: pop up start menu when press super key, Related #28467
+
+* Thu Mar 24 2022 caodongxia <caodongxia@huawei.com> - 1.22.3-3
+- restore else branch release
+
+* Mon Dec 13 2021 liweigang <liweiganga@uniontech.com> - 1.22.3-2
+- delete %dist
+
+* Thu Sep 19 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.3-1
+- update 1.22.3 release
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 17 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-1
+- update 1.22.2 release
+- add support for invisible borders
+
+* Thu Apr 25 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.1-1
+- update 1.22.1 release
+
+* Mon Mar 04 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.0-1
+- update to 1.22.0
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Dec 20 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.3-1
+- update to 1.20.3
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 14 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.2-1
+- update to 1.20.2 release
+
+* Wed Apr 25 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.1-2
+- improve HIDPI support
+
+* Tue Mar 27 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.1-1
+- update to 1.20.1
+
+* Sat Feb 10 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.0-1
+- update to 1.20 release
+- drop GSettings Schema rpm scriptlet
+- switch to using autosetup
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 01 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.2-1
+- update to 1.19.2
+- use https://github.com/mate-desktop/marco/pull/369
+
+* Mon Sep 04 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.1-1
+- update to 1.19.1
+
+* Wed Aug 09 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.0-5
+- remove virtual provides
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 13 2017 Kalev Lember <klember@redhat.com> - 1.19.0-2
+- Rebuilt for libgtop2 soname bump
+
+* Wed May 10 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.0-1
+- update to 1.19.0 release
+
+* Sat May 06 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.0-2
+- fix for https://github.com/mate-desktop/marco/issues/251
+- https://bugzilla.redhat.com/show_bug.cgi?id=1419634
+
+* Tue Mar 14 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.0-1
+- update to 1.18.0 release
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 18 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.1-1
+- update to 1.17.1 release
+- use https://github.com/mate-desktop/marco/pull/296
+
+* Sat Dec 03 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.0-1
+- update to 1.17.0 release
+
+* Thu Sep 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
+- update to 1.16.0 release
+
+* Thu Jun 09 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.0-1
+- update to 1.15.0 release
+- switch to gtk+3
+
+* Wed May 04 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.1.1
+- update to 1.14.1 release
+
+* Mon Feb 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.1-1
+- update to 1.13.1 release
+
+* Sun Feb 07 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.0-1
+- update to 1.13.0 release
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Jan 16 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.1-3
+- add a conflict macro to -libs and a obsolete to main package,
+- to fix rhbz (#1297958)
+
+* Sun Dec 20 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.1-2
+- split out marco libraries in a subpackage, needed for new compiz-0.8.10
+
+* Wed Dec 02 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.1-1
+- update to 1.12.1 release
+- removed upstreamed patch
+
+* Sun Nov 22 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.0-2
+- disable anmations on un-minimze
+
+* Fri Nov 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.0-1
+- update to 1.12.0 release
+
+* Mon Oct 26 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.11.1-1
+- update to 1.11.1 release
+- remove upstreamed patches
+
+* Fri Oct 23 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.11.0-3
+- fix rhbz (#1258638)
+- fix rhbz (#1258131), revert support for GTK_FRAME_EXTENTS for the moment 
+
+* Wed Oct 21 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.11.0-1
+- update to 1.11.0 release
+- disable patch for initial-setup
+
+* Thu Aug 20 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2.1
+- update to 1.10.2 release
+- remove upstreamed patches
+- fix rhbz (#1011869) (#1226530)
+
+* Fri Jul 31 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1.3
+- improve wine support, rhbz (#1190525)
+- fix crashes with some old metacity themes
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jun 12 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1.1
+- update to 1.10.1 release
+- removed upstreamed patches
+
+* Wed Apr 22 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-2
+- fix workspaces keybindings
+- fix windows keybindings
+- add keybindings for tiling
+- fix tile-preview
+
+* Mon Apr 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-1
+- update to 1.10.0 release
+
+* Thu Feb 26 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.90-1
+- update to 1.9.90 release
+
+* Wed Jan 14 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.4-1
+- update to 1.9.4 release
+
+* Thu Nov 20 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.3-1
+- update to 1.9.3 release
+
+* Tue Oct 21 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.2-3
+- add runtime require mate-desktop-libs to fix usage of initial-setup
+- in workstation product, rhbz (# 1160891)
+ 
+* Tue Oct 21 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.2-2
+- fix compositor-xrender: don't add shadows to ARGB
+- https://github.com/mate-desktop/marco/pull/141
+
+* Sun Oct 12 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.2-1
+- update to 1.9.2 release
+- adjust obsoletes
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jul 12 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.1-1
+- update to 1.9.1 release
+- use zenity as BR
+
+* Sun Jun 29 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.1-1
+- update to 1.8.1 release
+- remove upstreamed patch
+
+* Fri Jun 20 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.0-4
+- add marco_ignore-adding-a-window-if-already-present.patch
+- from upstream, fix hopefully rhbz (#1109528)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Apr 30 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.0-2
+- rebuild for libgtop2 soname bump
+
+* Tue Mar 04 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-1
+- Update to 1.8.0
+
+* Tue Feb 18 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.90-1
+- add 1.7.90 release
+
+* Mon Feb 10 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0.2
+- re-work marco_add-pixbuf-inline-icons.patch
+
+* Sun Feb 09 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.0-1
+- Update to 1.7.0
+
+* Fri Dec 20 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-0.5.git20131212.62a708d
+- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser
+- use modern 'make install' macro
+- improve obsoletes/provides, add limits
+
+* Sat Dec 14 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-0.4.git0403454e
+- remove isa tags from obsoletes/provides
+ 
+* Wed Dec 11 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-0.3.git0403454e
+- using 8 digets in git version to update mate-window-manager
+
+* Wed Dec 11 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-0.2.git0403454
+- rename mate-window-manager to marco
+
+* Fri Dec 06 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.0-1.1.git0403454
+- Update to 1.7.0 git snapshot
+
+* Wed Nov 13 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-6
+- start with side-by-side-tiling and windows-snapping-top-screen support for f20
+
+* Fri Sep 27 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-5
+- fix initial-setup issue, rhbz (#962009)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sat Jun 15 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-3
+- remove gsettings convert file
+
+* Tue Jun 11 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.2-2
+- Add libgtop2-devel to BR's
+
+* Sat Jun 08 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.2-1
+- Update to latest upstream release
+- Update datadir to mate-window-manager instead of marco
+
+* Sat Jun 08 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.1-2
+- Fix initial-setup, hopefully.
+
+* Wed Apr 03 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.1-1
+- Bug fix release. See changelog.
+
+* Wed Apr 03 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-1
+- Update to latest 1.6.0 stable release.
+
+* Mon Mar 25 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.5-1
+- Update to latest upstream release
+- Own dirs that we are supposed to owp
+
+* Fri Feb 22 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.4-1
+- Update to latest upstream release
+
+* Mon Feb 18 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-4
+- Add latest upstream commits
+
+* Tue Jan 29 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-3
+- Add some configure flags
+
+* Fri Jan 18 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-2
+- Sort BR's
+- Remove unneeded obsoletes tag
+
+* Mon Jan 14 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-1
+- Update to latest upstream release
+
+* Fri Jan 11 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.2-11
+- Convert back to old BR format
+- Drop unneeded BRs
+- Own directories that are supposed to be owned (marco-1)
+- Fix missing "X-Mate" category.
+- Add gsettings data convert file for users upgrading from 1.4
+- Fix update of gsettings enum preferences
+
+* Mon Dec 10 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.2-10
+- Rebuild for ARM
+
+* Sun Nov 25 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.2-9
+- Remove hard requires on mwm and mate-themes.
+
+* Sun Nov 25 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.2-8
+- Add xdamage as it is required for build
+
+* Wed Nov 14 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.2-7
+- move development files to devel
+- remove the config.h defines from %%build section
+
+* Tue Nov 13 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.2-6
+- Update configure flags, add disable scrollkeeper mainly
+
+* Tue Nov 13 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.2-5
+- add patch to fix startup rendering effect with composite enabled 
+
+* Tue Nov 06 2012 Rex Dieter <rdieter@fedoraproject.org> 1.5.2-4
+- Provides: firstboot(windowmanager) (#873342)
+
+* Mon Nov 05 2012 Rex Dieter <rdieter@fedoraproject.org> 1.5.2-3
+- drop Provides: firstboot(windowmanager) until bug #873342 is fixed
+
+* Sat Nov 03 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.2-2
+- Provides firstboot(windowmanager) mate-window-manager
+
+* Mon Oct 29 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.2-1
+- update to 1.5.2 release
+- add schema scriptlets and remove mateconf scriptlets
+- add requires gsettings-desktop-schemas
+- add build requires gsettings-desktop-schemas-devel and dconf-devel
+- change build requires style
+
+* Wed Oct 17 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.1-12
+- Fix crash if you have lots of workspaces
+
+* Tue Oct 16 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.1-11
+- filter provides
+- fix build requires
+- fix reqires
+- define some defaults
+- Add patch to allow breaking out from maximization during mouse resize
+  (gnome bz 622517)
+
+* Wed Sep 26 2012 Rex Dieter <rdieter@fedoraproject.org> - 1.4.1-10
+- fix ldconfig scriptlets
+- use desktop-file-validate again
+- own %%{_datadir}/mate/wm-properties/
+
+* Tue Sep 25 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-9
+- Remove mateconf obsolete scriplet
+
+* Mon Sep 24 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-8
+- rerefix mate-conf scriptlets. Add export line to REALLY not install schemas with make install.
+- comment out desktop-file-validate.
+
+* Mon Sep 17 2012 Rex Dieter <rdieter@fedoraproject.org> 1.4.1-7
+- fix/simplify dir ownership
+- omit not-needed/broken Obsoletes
+- (re)fix scriptlets :)
+
+* Sat Sep 15 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-6
+- Move post and postun scriptlets to proper location
+
+* Sat Sep 15 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-5
+- Remove onlyshowin since it is not needed any more with updated desktop-file-utils
+
+* Sat Sep 15 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-4
+- Update source to note git version.
+
+* Sun Sep 09 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-3
+- Fix broken dependencies, update to latest github version which contains fixes for desktop-file-utils
+
+* Mon Sep 03 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-2
+- Add environment variable to install section and further obsoletes to prevent dependency breakage
+
+* Sun Sep 02 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.1-1
+- Upgrade to new upstream version.
+
+* Mon Aug 27 2012 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-5
+- drop unneeded python-related build deps
+- %%configure --disable-schemas-install
+- fix/simplify some parent-dir ownership
+
+* Mon Aug 27 2012 Rex Dieter <rdieter@fedoraproject.org>  1.4.0-4
+- main pkg Requires: %%name-libs
+- drop needless icon scriptlets
+- s|MATE|X-MATE| .desktop Categories on < f18 only
+- License: GPLv2+
+
+* Sun Aug 26 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-3
+- Own theme directories that are being installed, switch from po_package to namefor lang files, bump release version
+
+* Sun Aug 26 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-2
+- Add mateconf scriptlets
+
+* Sun Aug 12 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-1
+- Initial build
Author	SHA1	Message	Date
openeuler-ci-bot	60449fea04	!13 remove patch From: @longcheng01 Reviewed-by: @tangjie02 Signed-off-by: @tangjie02	2022-08-12 02:21:05 +00:00
longcheng	7f60e13363	remove patches	2022-08-08 15:11:41 +08:00
openeuler-ci-bot	e114118cfc	!11 Remove some patches From: @longcheng01 Reviewed-by: @tangjie02 Signed-off-by: @tangjie02	2022-08-05 07:11:18 +00:00
longcheng	8f60aa59f5	Remove some patches Signed-off-by: longcheng <longcheng@kylinsec.com.cn>	2022-08-04 16:56:19 +08:00
openeuler-ci-bot	a379be34c1	!9 Add some patches From: @longcheng01 Reviewed-by: @yueyaoqiang Signed-off-by: @yueyaoqiang	2022-07-15 02:13:18 +00:00
longcheng	4c10743f21	Add some patches	2022-07-06 14:54:11 +08:00
openeuler-ci-bot	900b51afbe	!3 【轻量级 PR】：update marco.spec. ： delete %dist Merge pull request !3 from liweiganga/master	2021-12-23 02:24:18 +00:00
liwiegang	5b6edbddbf	delete %dist	2021-12-13 10:15:30 +08:00
openeuler-ci-bot	19e81b50dd	!2 .提交源码和spec文件 From: @xzyangha Reviewed-by: @hostfj Signed-off-by: @hostfj	2020-11-25 16:05:46 +08:00
xzyangha	17b1ed8447	上传源码和spec	2020-11-25 10:47:34 +08:00