diff --git a/desktop/mate/mate-screensaver/actions.py b/desktop/mate/mate-screensaver/actions.py index 4fdf0ea91e..bdf59d167d 100644 --- a/desktop/mate/mate-screensaver/actions.py +++ b/desktop/mate/mate-screensaver/actions.py @@ -23,7 +23,9 @@ def setup(): # for fix unused dependency pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") - + # patched pisi logo + pisitools.dosed("savers/gnomelogo-floaters.desktop.in.in", "Floating GNOME", "Floating PISI") + pisitools.dosed("po/tr.po", "Yüzen GNOME", "Yüzen PISI") def build(): autotools.make() diff --git a/desktop/mate/mate-screensaver/files/1.24.0_pisi_screen_saver.patch b/desktop/mate/mate-screensaver/files/1.24.0_pisi_screen_saver.patch deleted file mode 100644 index bdea701ac8..0000000000 --- a/desktop/mate/mate-screensaver/files/1.24.0_pisi_screen_saver.patch +++ /dev/null @@ -1,677 +0,0 @@ -diff -Nuar a/configure b/configure ---- a/configure 2020-02-10 15:37:38.000000000 +0300 -+++ b/configure 2020-03-23 14:46:21.449967069 +0300 -@@ -641,7 +641,7 @@ - privdatadir - privlibexecdir - MATE_SCREENSAVER_THEMES_DIR --FLOATERS_FOOT_GNOME_LOGO_IMAGE -+FLOATERS_FOOT_PISI_LOGO_IMAGE - FLOATERS_FOOT_LOGO_IMAGE - SLIDESHOW_COSMOS_DIR - DEBUG_CFLAGS -@@ -19955,8 +19955,7 @@ - - FLOATERS_FOOT_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/mate-logo-white.svg" - --FLOATERS_FOOT_GNOME_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/gnome-logo-white.svg" -- -+FLOATERS_FOOT_PISI_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/pisi-logo-white.svg" - - # Menu stuff - -diff -Nuar a/configure.ac b/configure.ac ---- a/configure.ac 2020-02-10 15:35:28.000000000 +0300 -+++ b/configure.ac 2020-03-23 14:45:46.404967165 +0300 -@@ -1080,8 +1080,8 @@ - - FLOATERS_FOOT_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/mate-logo-white.svg" - AC_SUBST(FLOATERS_FOOT_LOGO_IMAGE) --FLOATERS_FOOT_GNOME_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/gnome-logo-white.svg" --AC_SUBST(FLOATERS_FOOT_GNOME_LOGO_IMAGE) -+FLOATERS_FOOT_PISI_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/pisi-logo-white.svg" -+AC_SUBST(FLOATERS_FOOT_PISI_LOGO_IMAGE) - - # Menu stuff - -diff -Nuar a/data/images/cosmos/Makefile.in b/data/images/cosmos/Makefile.in ---- a/data/images/cosmos/Makefile.in 2020-02-10 15:37:39.000000000 +0300 -+++ b/data/images/cosmos/Makefile.in 2020-03-23 14:30:28.847969684 +0300 -@@ -191,7 +191,7 @@ - EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - FGREP = @FGREP@ --FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ -+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@ - FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@ - GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -diff -Nuar a/data/images/gnome-logo-white.svg b/data/images/gnome-logo-white.svg ---- a/data/images/gnome-logo-white.svg 2020-02-10 15:35:28.000000000 +0300 -+++ b/data/images/gnome-logo-white.svg 1970-01-01 02:00:00.000000000 +0200 -@@ -1,14 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -diff -Nuar a/data/images/Makefile.am b/data/images/Makefile.am ---- a/data/images/Makefile.am 2020-02-10 15:35:28.000000000 +0300 -+++ b/data/images/Makefile.am 2020-03-23 14:44:31.638967370 +0300 -@@ -7,7 +7,7 @@ - imagedir = $(datadir)/pixmaps - image_DATA = \ - mate-logo-white.svg \ -- gnome-logo-white.svg \ -+ pisi-logo-white.svg \ - $(NULL) - - EXTRA_DIST = \ -diff -Nuar a/data/images/Makefile.in b/data/images/Makefile.in ---- a/data/images/Makefile.in 2020-02-10 15:37:39.000000000 +0300 -+++ b/data/images/Makefile.in 2020-03-23 14:44:11.623967425 +0300 -@@ -251,7 +251,7 @@ - EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - FGREP = @FGREP@ --FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ -+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@ - FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@ - GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -419,7 +419,7 @@ - imagedir = $(datadir)/pixmaps - image_DATA = \ - mate-logo-white.svg \ -- gnome-logo-white.svg \ -+ pisi-logo-white.svg \ - $(NULL) - - EXTRA_DIST = \ -diff -Nuar a/data/images/pisi-logo-white.svg b/data/images/pisi-logo-white.svg ---- a/data/images/pisi-logo-white.svg 1970-01-01 02:00:00.000000000 +0200 -+++ b/data/images/pisi-logo-white.svg 2020-03-19 22:26:14.959997000 +0300 -@@ -0,0 +1,317 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -Nuar a/data/Makefile.in b/data/Makefile.in ---- a/data/Makefile.in 2020-02-10 15:37:39.000000000 +0300 -+++ b/data/Makefile.in 2020-03-23 14:29:44.312969806 +0300 -@@ -263,7 +263,7 @@ - EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - FGREP = @FGREP@ --FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ -+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@ - FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@ - GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -diff -Nuar a/doc/Makefile.in b/doc/Makefile.in ---- a/doc/Makefile.in 2020-02-10 15:37:39.000000000 +0300 -+++ b/doc/Makefile.in 2020-03-23 14:31:04.468969586 +0300 -@@ -192,7 +192,7 @@ - EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - FGREP = @FGREP@ --FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ -+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@ - FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@ - GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -diff -Nuar a/Makefile.in b/Makefile.in ---- a/Makefile.in 2020-02-10 15:37:39.000000000 +0300 -+++ b/Makefile.in 2020-03-23 14:36:30.305968692 +0300 -@@ -247,7 +247,7 @@ - EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - FGREP = @FGREP@ --FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ -+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@ - FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@ - GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -diff -Nuar a/po/tr.po b/po/tr.po ---- a/po/tr.po 2020-02-10 15:38:02.000000000 +0300 -+++ b/po/tr.po 2020-03-23 14:32:20.335969378 +0300 -@@ -338,13 +338,14 @@ - msgid "MATE;screensaver;logo;bubbles;" - msgstr "" - --#: savers/gnomelogo-floaters.desktop.in.in:3 --msgid "Floating GNOME" --msgstr "Yüzen GNOME" - --#: savers/gnomelogo-floaters.desktop.in.in:4 --msgid "Bubbles the GNOME logo around the screen" --msgstr "Ekran üzerinde GNOME logosu baloncukları oluşturur" -+#: savers/pisilogo-floaters.desktop.in.in:3 -+msgid "Floating PISI" -+msgstr "Yüzen PISI" -+ -+#: savers/pisilogo-floaters.desktop.in.in:4 -+msgid "Bubbles the PISI logo around the screen" -+msgstr "Ekran üzerinde PISI logosu baloncukları oluşturur" - - #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! - #: savers/gnomelogo-floaters.desktop.in.in:12 -diff -Nuar a/savers/gnomelogo-floaters.desktop.in b/savers/gnomelogo-floaters.desktop.in ---- a/savers/gnomelogo-floaters.desktop.in 2020-02-10 15:38:45.000000000 +0300 -+++ b/savers/gnomelogo-floaters.desktop.in 1970-01-01 02:00:00.000000000 +0200 -@@ -1,12 +0,0 @@ --[Desktop Entry] --Name=Floating GNOME --Comment=Bubbles the GNOME logo around the screen --Exec=/usr/local/libexec/mate-screensaver/floaters /usr/local/share/pixmaps/gnome-logo-white.svg --TryExec=/usr/local/libexec/mate-screensaver/floaters --StartupNotify=false --Terminal=false --Type=Application --Categories=Screensaver; --# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! --Keywords=MATE;screensaver;GNOME;logo;bubbles; --OnlyShowIn=MATE; -diff -Nuar a/savers/gnomelogo-floaters.desktop.in.in b/savers/gnomelogo-floaters.desktop.in.in ---- a/savers/gnomelogo-floaters.desktop.in.in 2020-02-10 15:35:28.000000000 +0300 -+++ b/savers/gnomelogo-floaters.desktop.in.in 1970-01-01 02:00:00.000000000 +0200 -@@ -1,12 +0,0 @@ --[Desktop Entry] --Name=Floating GNOME --Comment=Bubbles the GNOME logo around the screen --Exec=@SAVERDIR@/floaters @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ --TryExec=@SAVERDIR@/floaters --StartupNotify=false --Terminal=false --Type=Application --Categories=Screensaver; --# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! --Keywords=MATE;screensaver;GNOME;logo;bubbles; --OnlyShowIn=MATE; -diff -Nuar a/savers/Makefile.am b/savers/Makefile.am ---- a/savers/Makefile.am 2020-02-10 15:35:28.000000000 +0300 -+++ b/savers/Makefile.am 2020-03-23 14:34:38.422968999 +0300 -@@ -17,7 +17,7 @@ - DESKTOP_IN_IN_FILES = \ - cosmos-slideshow.desktop.in.in \ - footlogo-floaters.desktop.in.in \ -- gnomelogo-floaters.desktop.in.in \ -+ pisilogo-floaters.desktop.in.in \ - personal-slideshow.desktop.in.in \ - popsquares.desktop.in.in \ - $(NULL) -@@ -26,7 +26,7 @@ - @$(edit) $< >$@ - footlogo-floaters.desktop.in: footlogo-floaters.desktop.in.in Makefile - @$(edit) $< >$@ --gnomelogo-floaters.desktop.in: gnomelogo-floaters.desktop.in.in Makefile -+pisilogo-floaters.desktop.in: pisilogo-floaters.desktop.in.in Makefile - @$(edit) $< >$@ - personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile - @$(edit) $< >$@ -@@ -36,7 +36,7 @@ - edit = sed \ - -e 's|@SLIDESHOW_COSMOS_DIR[@]|$(SLIDESHOW_COSMOS_DIR)|g' \ - -e 's|@FLOATERS_FOOT_LOGO_IMAGE[@]|$(FLOATERS_FOOT_LOGO_IMAGE)|g' \ -- -e 's|@FLOATERS_FOOT_GNOME_LOGO_IMAGE[@]|$(FLOATERS_FOOT_GNOME_LOGO_IMAGE)|g' \ -+ -e 's|@FLOATERS_FOOT_PISI_LOGO_IMAGE[@]|$(FLOATERS_FOOT_PISI_LOGO_IMAGE)|g' \ - -e 's|@SAVERDIR[@]|$(privlibexecdir)|g' - - %.desktop: %.desktop.in -@@ -46,7 +46,7 @@ - themes_in_files = \ - cosmos-slideshow.desktop.in \ - footlogo-floaters.desktop.in \ -- gnomelogo-floaters.desktop.in \ -+ pisilogo-floaters.desktop.in \ - personal-slideshow.desktop.in \ - popsquares.desktop.in \ - $(NULL) -@@ -131,7 +131,7 @@ - $(BUILT_SOURCES) \ - cosmos-slideshow.desktop.in \ - footlogo-floaters.desktop.in \ -- gnomelogo-floaters.desktop.in \ -+ pisilogo-floaters.desktop.in \ - popsquares.desktop.in \ - personal-slideshow.desktop.in \ - $(NULL) -@@ -145,7 +145,7 @@ - Makefile.in \ - cosmos-slideshow.desktop \ - footlogo-floaters.desktop \ -- gnomelogo-floaters.desktop \ -+ pisilogo-floaters.desktop \ - personal-slideshow.desktop \ - popsquares.desktop \ - $(NULL) -diff -Nuar a/savers/Makefile.in b/savers/Makefile.in ---- a/savers/Makefile.in 2020-02-10 15:37:39.000000000 +0300 -+++ b/savers/Makefile.in 2020-03-23 14:33:43.240969150 +0300 -@@ -283,7 +283,7 @@ - EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - FGREP = @FGREP@ --FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ -+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@ - FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@ - GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -459,7 +459,7 @@ - DESKTOP_IN_IN_FILES = \ - cosmos-slideshow.desktop.in.in \ - footlogo-floaters.desktop.in.in \ -- gnomelogo-floaters.desktop.in.in \ -+ pisilogo-floaters.desktop.in.in \ - personal-slideshow.desktop.in.in \ - popsquares.desktop.in.in \ - $(NULL) -@@ -467,13 +467,13 @@ - edit = sed \ - -e 's|@SLIDESHOW_COSMOS_DIR[@]|$(SLIDESHOW_COSMOS_DIR)|g' \ - -e 's|@FLOATERS_FOOT_LOGO_IMAGE[@]|$(FLOATERS_FOOT_LOGO_IMAGE)|g' \ -- -e 's|@FLOATERS_FOOT_GNOME_LOGO_IMAGE[@]|$(FLOATERS_FOOT_GNOME_LOGO_IMAGE)|g' \ -+ -e 's|@FLOATERS_FOOT_PISI_LOGO_IMAGE[@]|$(FLOATERS_FOOT_PISI_LOGO_IMAGE)|g' \ - -e 's|@SAVERDIR[@]|$(privlibexecdir)|g' - - themes_in_files = \ - cosmos-slideshow.desktop.in \ - footlogo-floaters.desktop.in \ -- gnomelogo-floaters.desktop.in \ -+ pisilogo-floaters.desktop.in \ - personal-slideshow.desktop.in \ - popsquares.desktop.in \ - $(NULL) -@@ -545,7 +545,7 @@ - $(BUILT_SOURCES) \ - cosmos-slideshow.desktop.in \ - footlogo-floaters.desktop.in \ -- gnomelogo-floaters.desktop.in \ -+ pisilogo-floaters.desktop.in \ - popsquares.desktop.in \ - personal-slideshow.desktop.in \ - $(NULL) -@@ -559,7 +559,7 @@ - Makefile.in \ - cosmos-slideshow.desktop \ - footlogo-floaters.desktop \ -- gnomelogo-floaters.desktop \ -+ pisilogo-floaters.desktop \ - personal-slideshow.desktop \ - popsquares.desktop \ - $(NULL) -@@ -1020,7 +1020,7 @@ - @$(edit) $< >$@ - footlogo-floaters.desktop.in: footlogo-floaters.desktop.in.in Makefile - @$(edit) $< >$@ --gnomelogo-floaters.desktop.in: gnomelogo-floaters.desktop.in.in Makefile -+pisilogo-floaters.desktop.in: pisilogo-floaters.desktop.in.in Makefile - @$(edit) $< >$@ - personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile - @$(edit) $< >$@ -diff -Nuar a/savers/pisilogo-floaters.desktop.in b/savers/pisilogo-floaters.desktop.in ---- a/savers/pisilogo-floaters.desktop.in 1970-01-01 02:00:00.000000000 +0200 -+++ b/savers/pisilogo-floaters.desktop.in 2020-03-23 14:47:54.946966812 +0300 -@@ -0,0 +1,12 @@ -+[Desktop Entry] -+Name=Floating PISI -+Comment=Bubbles the PISI logo around the screen -+Exec=/usr/local/libexec/mate-screensaver/floaters /usr/local/share/pixmaps/pisi-logo-white.svg -+TryExec=/usr/local/libexec/mate-screensaver/floaters -+StartupNotify=false -+Terminal=false -+Type=Application -+Categories=Screensaver; -+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -+Keywords=MATE;screensaver;GNOME;logo;bubbles; -+OnlyShowIn=MATE; -diff -Nuar a/savers/pisilogo-floaters.desktop.in.in b/savers/pisilogo-floaters.desktop.in.in ---- a/savers/pisilogo-floaters.desktop.in.in 1970-01-01 02:00:00.000000000 +0200 -+++ b/savers/pisilogo-floaters.desktop.in.in 2020-03-23 12:45:44.889986933 +0300 -@@ -0,0 +1,12 @@ -+[Desktop Entry] -+Name=Floating PISI -+Comment=Bubbles the PISI logo around the screen -+Exec=@SAVERDIR@/floaters @FLOATERS_FOOT_PISI_LOGO_IMAGE@ -+TryExec=@SAVERDIR@/floaters -+StartupNotify=false -+Terminal=false -+Type=Application -+Categories=Screensaver; -+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -+Keywords=MATE;screensaver;GNOME;logo;bubbles; -+OnlyShowIn=MATE; -diff -Nuar a/src/Makefile.in b/src/Makefile.in ---- a/src/Makefile.in 2020-02-10 15:37:39.000000000 +0300 -+++ b/src/Makefile.in 2020-03-23 14:35:02.938968931 +0300 -@@ -359,7 +359,7 @@ - EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - FGREP = @FGREP@ --FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@ -+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@ - FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@ - GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ diff --git a/desktop/mate/mate-screensaver/files/logotype-pisi.svg b/desktop/mate/mate-screensaver/files/logotype-pisi.svg new file mode 100644 index 0000000000..8d6873dc12 --- /dev/null +++ b/desktop/mate/mate-screensaver/files/logotype-pisi.svg @@ -0,0 +1,335 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/desktop/mate/mate-screensaver/pspec.xml b/desktop/mate/mate-screensaver/pspec.xml index 3e8e5ccb5c..d1c84bd720 100644 --- a/desktop/mate/mate-screensaver/pspec.xml +++ b/desktop/mate/mate-screensaver/pspec.xml @@ -38,7 +38,7 @@ autoconf-archive - pisi_screen_saver.patch + @@ -83,6 +83,9 @@ /usr/share/desktop-directories /usr/share/mate-background-properties + + logotype-pisi.svg +