[packages/guake] - up to 3.10 with a bunch of fixes from debian
baggins
baggins at pld-linux.org
Thu Sep 21 17:41:28 CEST 2023
commit cbad10bc87e3cc673cd61761b43a96c8ea8bdc75
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Sep 21 17:08:23 2023 +0200
- up to 3.10 with a bunch of fixes from debian
dont_try_compile_schemas.patch | 33 ++++++
dont_use_pip_to_build.patch | 16 +++
fix_manpage_name.patch | 249 +++++++++++++++++++++++++++++++++++++++++
guake-desktop.patch | 16 ---
guake.spec | 71 ++++++------
set_scripts_path.patch | 19 ++++
6 files changed, 352 insertions(+), 52 deletions(-)
---
diff --git a/guake.spec b/guake.spec
index c11f813..6b598a6 100644
--- a/guake.spec
+++ b/guake.spec
@@ -1,29 +1,36 @@
Summary: guake - a drop-down terminal
Summary(pl.UTF-8): guake - wyskakujący terminal
Name: guake
-Version: 0.4.2
-Release: 2
+Version: 3.10
+Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://guake.org/files/%{name}-%{version}.tar.gz
-# Source0-md5: 1f0feff3bfc15c998147dbf07d9d8a8e
-Patch0: %{name}-desktop.patch
+Source0: https://github.com/Guake/guake/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: d06eb4b40645f6d71552418102ccc04e
+Patch0: set_scripts_path.patch
+Patch1: dont_try_compile_schemas.patch
+Patch2: dont_use_pip_to_build.patch
+Patch3: fix_manpage_name.patch
URL: http://guake.org/
-BuildRequires: GConf2-devel
+BuildRequires: glib2
BuildRequires: gettext-tools
BuildRequires: intltool >= 0.35
BuildRequires: pkgconfig
-BuildRequires: python-pygtk-devel
-BuildRequires: python-vte
+BuildRequires: python3-pygobject3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-pbr
+BuildRequires: python3-pip
+BuildRequires: python3-reno
+BuildRequires: python3-sphinxcontrib-programoutput
+BuildRequires: python3-wheel
BuildRequires: rpm-pythonprov
BuildRequires: sed >= 4.0
Requires(post,postun): desktop-file-utils
-Requires(post,postun): scrollkeeper
-Requires(post,preun): GConf2
Requires: dbus(org.freedesktop.Notifications)
-Requires: python-gnome-gconf
-Requires: python-pygtk-glade
-Requires: python-pynotify
+Requires: python3-pygobject3
+Requires: python3-notify2
+Requires: python3-pbr
+BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -37,24 +44,25 @@ przycisk aby go wywołać i nacisnąć ponownie by schować.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
-%configure \
- --disable-schemas-install \
- --disable-static
-
%{__make}
+%{__make} -C docs man
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_datadir}/glib-2.0/schemas,%{_mandir}/man1}
+PBR_VERSION=%{version} \
+SETUPTOOLS_SCM_PRETEND_VERSION=%{version} \
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/guake/*.la
-
-mv $RPM_BUILD_ROOT%{_datadir}/locale/{no,nb}
+ DESTDIR=$RPM_BUILD_ROOT \
+ PREFIX=%{_prefix}
+cp -p docs/_build/man/guake.1 $RPM_BUILD_ROOT%{_mandir}/man1
%find_lang %{name}
%clean
@@ -62,27 +70,18 @@ rm -rf $RPM_BUILD_ROOT
%post
%update_desktop_database
-%gconf_schema_install guake.schemas
-
-%preun
-%gconf_schema_uninstall guake.schemas
%postun
%update_desktop_database_postun
-%posttrans
-killall -HUP gconfd-2 > /dev/null || :
-
%files -f %{name}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/guake
-%attr(755,root,root) %{_libdir}/guake/*.so
-%{_libdir}/guake/*.py
+%{py3_sitescriptdir}/guake
+%{py3_sitescriptdir}/guake-%{version}-py*.egg-info
%{_datadir}/guake
-%{_pixmapsdir}/guake
+%{_pixmapsdir}/guake.png
%{_desktopdir}/*.desktop
-%{_datadir}/dbus-1/services/org.guake.Guake.service
-%{_sysconfdir}/gconf/schemas/guake.schemas
-%{_sysconfdir}/xdg/autostart/guake.desktop
+%{_datadir}/glib-2.0/schemas/org.guake.gschema.xml
%{_mandir}/man1/guake.1*
+%{_metainfodir}/guake.desktop.metainfo.xml
diff --git a/dont_try_compile_schemas.patch b/dont_try_compile_schemas.patch
new file mode 100644
index 0000000..a3488f4
--- /dev/null
+++ b/dont_try_compile_schemas.patch
@@ -0,0 +1,33 @@
+From: Daniel Echeverry <epsilon at debian.org>
+Date: Sun, 7 Nov 2021 17:10:54 -0500
+Subject: Don't try recompile schemas, we do that from postinst script
+
+Forwarded: not-needed
+---
+ guake/guake_app.py | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/guake/guake_app.py b/guake/guake_app.py
+index d524275..c03cde8 100644
+--- a/guake/guake_app.py
++++ b/guake/guake_app.py
+@@ -118,19 +118,6 @@ class Guake(SimpleGladeApp):
+ self.settings = Settings(schema_source)
+ self.accel_group = None
+
+- if (
+- "schema-version" not in self.settings.general.keys()
+- or self.settings.general.get_string("schema-version") != guake_version()
+- ):
+- log.exception("Schema from old guake version detected, regenerating schema")
+- try:
+- try_to_compile_glib_schemas()
+- except subprocess.CalledProcessError:
+- log.exception("Schema in non user-editable location, attempting to continue")
+- schema_source = load_schema()
+- self.settings = Settings(schema_source)
+- self.settings.general.set_string("schema-version", guake_version())
+-
+ log.info("Language previously loaded from: %s", LOCALE_DIR)
+
+ super().__init__(gladefile("guake.glade"))
diff --git a/dont_use_pip_to_build.patch b/dont_use_pip_to_build.patch
new file mode 100644
index 0000000..7910efa
--- /dev/null
+++ b/dont_use_pip_to_build.patch
@@ -0,0 +1,16 @@
+From: Daniel Echeverri <epsilon at debian.org>
+Date: Sun, 29 Jul 2023 21:27:51 -0500
+Subject: Don't use pip to build because this requires internet connection.
+Forwarded: not-needed
+
+--- a/Makefile
++++ b/Makefile
+@@ -94,7 +94,7 @@
+ @sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|"$(LOGIN_DESTOP_PATH)"|g' guake/paths.py
+ @sed -i -e 's|{{ AUTOSTART_FOLDER }}|"$(AUTOSTART_FOLDER)"|g' guake/paths.py
+
+- @$(PYTHON_INTERPRETER) -m pip install . --root "$(DESTDIR)" --prefix="/usr" || echo -e "\033[31;1msetup.py install failed, you may need to run \"sudo git config --global --add safe.directory '*'\"\033[0m"
++ @$(PYTHON_INTERPRETER) setup.py install --root "$(DESTDIR)" --prefix="/usr" --optimize=1 || echo -e "\033[31;1msetup.py install failed, you may need to run \"sudo git config --global --add safe.directory '*'\"\033[0m"
+
+ @rm -f guake/paths.py
+ @if [ -f guake/paths.py.dev ]; then mv guake/paths.py.dev guake/paths.py; fi
diff --git a/fix_manpage_name.patch b/fix_manpage_name.patch
new file mode 100644
index 0000000..9542fd1
--- /dev/null
+++ b/fix_manpage_name.patch
@@ -0,0 +1,249 @@
+From: Daniel Echeverri <epsilon at debian.org>
+Date: Sat, 19 Feb 2022 00:00:00 -0500
+Subject: Fix name and some typos.
+
+Forwarded: not-needed
+---
+ NEWS.rst | 30 +++++++++++++++---------------
+ docs/source/conf.py | 4 +++-
+ docs/source/contributing/hacking.rst | 4 ++--
+ docs/source/user/cli.rst | 2 +-
+ docs/source/user/gtk3.rst | 4 ++--
+ docs/source/user/installing.rst | 2 +-
+ docs/source/user/whatisguake.rst | 2 +-
+ 7 files changed, 25 insertions(+), 23 deletions(-)
+
+diff --git a/NEWS.rst b/NEWS.rst
+index 68db86a..b9d959c 100644
+--- a/NEWS.rst
++++ b/NEWS.rst
+@@ -42,7 +42,7 @@ Bug Fixes
+
+ - Reinstated double clicking to open new tabs
+
+-- Use keycodes instead of keyvals for keybindings. This allow to use keybindings with different keyboard layouts.
++- Use keycodes instead of keyvals for keybindings. This allow one to use keybindings with different keyboard layouts.
+
+ Notes for Package Maintainers
+ -----------------------------
+@@ -165,7 +165,7 @@ Automatically hide the tab bar when there is only one tab
+
+ Add close tab to d-bus interface.
+
+-Fix ignored "Show scrollbar" after spliting vertically
++Fix ignored "Show scrollbar" after splitting vertically
+
+ Fix missing or malformed schema files when upgrading guake
+
+@@ -256,7 +256,7 @@ Bug Fixes
+
+ - Fix config didn't reload when set_workspace
+
+-- Fix ineffective override of the GDK_BACKEND environement variable causing invalid pointer location and display detection (#1820)
++- Fix ineffective override of the GDK_BACKEND environment variable causing invalid pointer location and display detection (#1820)
+
+ - - fixes an issue, where double-clicking in certain CLI apps would instead open a new tab #1697
+
+@@ -1034,7 +1034,7 @@ Translation Updates
+ Notes for Package Maintainers
+ -----------------------------
+
+-- The setup mecanism has changed a little bit. Some maintainers used to patch the source code
++- The setup mechanism has changed a little bit. Some maintainers used to patch the source code
+ of Guake to change the pixmap, Gtk schema or locale paths directly in the ``guake/globals.py``
+ file. This was due to a lack of flexibility of the installation target of the ``Makefile``.
+
+@@ -1121,7 +1121,7 @@ Bug Fixes
+
+ - fixes issue with vertically stacked dual monitors #1162
+
+-- Quick Open functionnality is restored #1121
++- Quick Open functionality is restored #1121
+
+ - Unusable Guake with "hide on focus lose" option #1152
+
+@@ -1135,7 +1135,7 @@ Release Summary
+
+ This minor release mainly focus on fixing big problems that was remaining after the migration to GTK3. I would like to akwonledge the work of some contributors that helped testing and reporting issues on Guake 3.0.0. Thanks a lot to @egmontkob and @aichingm.
+
+-The Preference window has been deeply reworked and the hotkey management has been rewriten. This was one the the major regression in Guake 3.0.
++The Preference window has been deeply reworked and the hotkey management has been rewritten. This was one the the major regression in Guake 3.0.
+
+ New Features
+ ------------
+@@ -1173,7 +1173,7 @@ Bug Fixes
+ - Resolved conflicting default shortcut for ``Ctrl+F2`` (now, rename current tab is set to
+ ``Ctrl+Shift+R``) #1101, #1098
+
+-- The hotkey management has been rewriten and is now fully functional
++- The hotkey management has been rewritten and is now fully functional
+
+ - Rework the Preference window and reorganize the settings. Lot of small issues
+ has been fixed.
+@@ -1336,7 +1336,7 @@ Translation Updates
+ Version 0.8.11
+ --------------
+
+-Maintainance release with bug fixes and translation updates.
++Maintenance release with bug fixes and translation updates.
+
+ - #885 revert to the old fixed-width tabs behavior
+ - move the startup script setting to the hooks tab
+@@ -1387,7 +1387,7 @@ Bug Fixes:
+
+ - Fix error when toggle key was disabled
+ - Update change news
+-- Uppercase pallete name
++- Uppercase palette name
+ - Fix pylint errors
+ - Convert README badge to SVG
+ - Update Japanese translation
+@@ -1432,7 +1432,7 @@ Version 0.8.5
+ Minor version today, mostly minor bug fixes and translation update.
+
+ I did have time to work on GTK3, maintaining Guake to keep using GTK2 is more and more difficult,
+-Travis kind of abandonned the compatibility of PyGtk2.
++Travis kind of abandoned the compatibility of PyGtk2.
+
+ * Add a shortcut to open the last tab (#706, thanks @evgenius)
+ * Fix icon size on Ubuntu (#734)
+@@ -1480,7 +1480,7 @@ Bug fixes:
+ - open new tab in current directory (#578, @Xtreak)
+ - fix default interpreter (#619, @Xtreak)
+ - fix use VTE title (#524, @Xtreak)
+-- Russian tranlation (@vantu5z), german (@Airfunker), spanish (@thardev) chinese (@Xinyu Ng)
++- Russian translation (@vantu5z), german (@Airfunker), spanish (@thardev) chinese (@Xinyu Ng)
+ - fix guake cannot restore fullscreen (#628, @thardev)
+
+
+@@ -1566,7 +1566,7 @@ Version 0.7.2 (2015.05.20)
+
+ Bug fixes:
+
+- - Fix Ctrl+D regresion (#550)
++ - Fix Ctrl+D regression (#550)
+ - update Quick Open Preference Window
+
+
+@@ -1617,7 +1617,7 @@ Version 0.7.0 (2015.05.02):
+ - Expose cursor_shape and blink cursor method in pref window (#505)
+ - Expose Guake startup script to the pref window (#198)
+ - Some window management bug fixes (#506, #445)
+- - Fix "Not focused on openning if tab was moved" (#441)
++ - Fix "Not focused on opening if tab was moved" (#441)
+ - Add contextual menu item 'Open Link' on right click on a link (5476653)
+ - Fix compatibility with Ubuntu 15.04 (#509)
+ - Fix Guake Turns Gray sometimes (#473, #512)
+@@ -1690,7 +1690,7 @@ Versions < 0.5.0
+
+ changes since 0.4.4:
+
+- - Custom tab titles are no longer overriden by VTE ones (rgaudin)
++ - Custom tab titles are no longer overridden by VTE ones (rgaudin)
+ - Absent notifications daemon is no longer fatal
+ - Fix for <Ctrl>key hotkeys being recorded as <Primary>key (Ian MacLeod)
+ - Font resizing using <Ctrl>+ and <Ctrl>- (Eiichi Sato)
+@@ -1714,7 +1714,7 @@ changes since 0.4.3:
+ - Terminal scrolls to the wrong position when hiding and unhiding in fullscreen mode #258
+ (Empee584)
+ - Toggle fullscreen malfunction #371 (Empee584 & Sylvestre)
+- - Guake overlaped the second screen in a dual-monitor setup with a sidepanel (Sylvestre)
++ - Guake overlapped the second screen in a dual-monitor setup with a sidepanel (Sylvestre)
+ - Tree items in Keyboard shortcuts tab of preferences window not localized #280 (Robertd)
+ - Add option to start in fullscreen mode #408 (Dom Sekotill)
+ - Refactoring of the fullscreen logic and addition of the --fullscreen flag (Marcel Partap)
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index 8b4ba31..5597055 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -220,7 +220,9 @@ latex_documents = [
+
+ # One entry per manual page. List of tuples
+ # (source start file, name, description, authors, manual section).
+-man_pages = [("index", "pythonfiximports", "Python Fix Imports Documentation", ["Gaetan Semet"], 1)]
++man_pages = [
++ ('index', 'guake', u'A drop-down terminal for GNOME environment', [u'Gaetan Semet'], 1)
++]
+
+ # If true, show URL addresses after external links.
+ # man_show_urls = False
+diff --git a/docs/source/contributing/hacking.rst b/docs/source/contributing/hacking.rst
+index 2186f35..1bde7f9 100644
+--- a/docs/source/contributing/hacking.rst
++++ b/docs/source/contributing/hacking.rst
+@@ -5,7 +5,7 @@ Hacking Guake
+ Contributing
+ ============
+
+-First, be sure to use a verion of Python 3 where GTK and GObjects works in your system.
++First, be sure to use a version of Python 3 where GTK and GObjects works in your system.
+ For instance, under Ubuntu 17.04, PyGtk and ``python3-gi`` does not work well if the default
+ python 3 interpreter is forced to Python 3.6.
+
+@@ -74,7 +74,7 @@ building the distribution packages.
+
+ Same goes for the `ChangeLog` file.
+
+-Versionning
++Versioning
+ -----------
+
+ Versioning is automatically done using git tags. When a semver tag is pushed, a new version
+diff --git a/docs/source/user/cli.rst b/docs/source/user/cli.rst
+index b2e1b50..eadc53b 100644
+--- a/docs/source/user/cli.rst
++++ b/docs/source/user/cli.rst
+@@ -4,4 +4,4 @@
+
+ Here is the command line interface Guake provides:
+
+-.. program-output:: guake --help
++.. program-output:: echo "Please run guake --help to see command line interface help"
+diff --git a/docs/source/user/gtk3.rst b/docs/source/user/gtk3.rst
+index 8a4d818..7777ee5 100644
+--- a/docs/source/user/gtk3.rst
++++ b/docs/source/user/gtk3.rst
+@@ -28,7 +28,7 @@ Some changes in translation system made during the Guake 3 port may have broken
+ in some languages (#1209).
+
+ Help is welcomed for updating translations in your language ! See the "Update translation" section
+-bellow.
++below.
+
+ Note for maintainers
+ --------------------
+@@ -43,7 +43,7 @@ ReadTheDocs only support ``requirements.txt`` for the moment), by a tool I've de
+ ``pipenv_to_requirements`` (makefile target ``make requirements``).
+ It does generate ``requirements.txt`` (running dependencies), and ``requirements-dev.txt`` (build,
+ checks and test only). From then, Guake is now a classic, canon Python package (with setup.py,
+-building distrubution packages, ...).
++building distribution packages, ...).
+
+ It however requires system libraries, so cannot work isolated inside a virtualenv. If you look
+ closer to the virtualenv used with ``make dev ; make run``, you will see it is configured to use
+diff --git a/docs/source/user/installing.rst b/docs/source/user/installing.rst
+index 17dec86..666fb58 100644
+--- a/docs/source/user/installing.rst
++++ b/docs/source/user/installing.rst
+@@ -50,7 +50,7 @@ Then you can open it via:
+
+ $ guake
+
+-To allow global 'F12' to open the guake, go to Setting >> Device >> Keyboard >> Scroll to bottom >> "+" to create a new global short cut with 'F12' keybinding and comand 'guake'.
++To allow global 'F12' to open the guake, go to Setting >> Device >> Keyboard >> Scroll to bottom >> "+" to create a new global short cut with 'F12' keybinding and command 'guake'.
+
+ You may notice the style may have some error. You can fix this by installing and apply custom theme.
+
+diff --git a/docs/source/user/whatisguake.rst b/docs/source/user/whatisguake.rst
+index 1da0fe7..87e8f71 100644
+--- a/docs/source/user/whatisguake.rst
++++ b/docs/source/user/whatisguake.rst
+@@ -8,7 +8,7 @@ the swiss knife of any developer willing to increase its productivity.
+ Alternatives to Guake
+ =====================
+
+-Here are some of the best terminals avaiable on the Linux environments that bring similar features
++Here are some of the best terminals available on the Linux environments that bring similar features
+ of Guake:
+
+ - `Tilda <https://github.com/lanoxx/tilda/>`_
diff --git a/guake-desktop.patch b/guake-desktop.patch
deleted file mode 100644
index 4ec4065..0000000
--- a/guake-desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- guake-0.4.0/data/guake-prefs.desktop.in.old 2009-11-01 02:57:58.000000000 +0100
-+++ guake-0.4.0/data/guake-prefs.desktop.in 2009-11-01 02:58:12.000000000 +0100
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Guake Preferences
- Name[pt_BR]=Preferências do Guake
- Comment=Comment=Configure your Guake sessions
---- guake-0.4.0/data/guake.desktop.in.old 2009-11-01 02:57:50.000000000 +0100
-+++ guake-0.4.0/data/guake.desktop.in 2009-11-01 02:58:06.000000000 +0100
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Guake Terminal
- Name[pt]=Guake Terminal
- Name[pt_BR]=Guake Terminal
diff --git a/set_scripts_path.patch b/set_scripts_path.patch
new file mode 100644
index 0000000..d3b9692
--- /dev/null
+++ b/set_scripts_path.patch
@@ -0,0 +1,19 @@
+From: Daniel Echeverri <epsilon at debian.org>
+Date: Sat, 29 Oct 2022 21:27:51 -0500
+Subject: Add install-scripts path in setup.cfg for install scripts in
+ /usr/bin
+
+Forwarded: not-needed
+---
+ setup.cfg | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -56,3 +56,6 @@
+
+ [pep8]
+ max-line-length = 100
++
++[install]
++install-scripts= /usr/bin
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/guake.git/commitdiff/cbad10bc87e3cc673cd61761b43a96c8ea8bdc75
More information about the pld-cvs-commit
mailing list