diff --git a/headerbar_subtitle.patch b/headerbar_subtitle.patch new file mode 100644 index 0000000..ec13cf3 --- /dev/null +++ b/headerbar_subtitle.patch @@ -0,0 +1,27 @@ +From 7c9e9e0eadab966ebdd94ca6f6ead56a36ce1347 Mon Sep 17 00:00:00 2001 +From: "Maurizio Galli (m4u9)" +Date: Wed, 23 Dec 2020 07:36:59 +0100 +Subject: [PATCH] Don't reserve vertical space for subtitles in headerbars + +--- + libxfce4ui/xfce-titled-dialog.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libxfce4ui/xfce-titled-dialog.c b/libxfce4ui/xfce-titled-dialog.c +index 52181a2..0422d69 100644 +--- a/libxfce4ui/xfce-titled-dialog.c ++++ b/libxfce4ui/xfce-titled-dialog.c +@@ -162,6 +162,9 @@ xfce_titled_dialog_init (XfceTitledDialog *titled_dialog) + titled_dialog->priv->headerbar = gtk_dialog_get_header_bar (GTK_DIALOG (titled_dialog)); + g_return_if_fail (GTK_IS_HEADER_BAR (titled_dialog->priv->headerbar)); + ++ /* Don't reserve vertical space for subtitles */ ++ gtk_header_bar_set_has_subtitle (gtk_dialog_get_header_bar (GTK_DIALOG (titled_dialog)), FALSE); ++ + /* Pack the window icon into the headerbar */ + titled_dialog->priv->icon = gtk_image_new (); + gtk_header_bar_pack_start (GTK_HEADER_BAR (titled_dialog->priv->headerbar), titled_dialog->priv->icon); +-- +GitLab + + diff --git a/libxfce4ui-4.14.1.tar.bz2 b/libxfce4ui-4.14.1.tar.bz2 deleted file mode 100644 index 8c1d724..0000000 --- a/libxfce4ui-4.14.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c449075eaeae4d1138d22eeed3d2ad7032b87fb8878eada9b770325bed87f2da -size 756175 diff --git a/libxfce4ui-4.16.0.tar.bz2 b/libxfce4ui-4.16.0.tar.bz2 new file mode 100644 index 0000000..d87b916 --- /dev/null +++ b/libxfce4ui-4.16.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa +size 837838 diff --git a/libxfce4ui.changes b/libxfce4ui.changes index f0b0f6d..fadba22 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,200 @@ +------------------------------------------------------------------- +Thu Dec 24 07:19:04 UTC 2020 - Maurizio Galli + +- Added headerbar_subtitle.patch to remove subtitle space from + headerbars in Xfce applications + +------------------------------------------------------------------- +Wed Dec 23 00:25:39 UTC 2020 - Maurizio Galli + +- Update to version 4.16.0 + * about: Harmonize capitalisation + * Update credits for Xfce 4.16 + * Translation Updates + +------------------------------------------------------------------- +Wed Dec 16 22:58:12 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.8 + * Add xfce_has_gtk_frame_extents to better handle CSD + * Translation Updates + +------------------------------------------------------------------- +Mon Dec 14 09:39:41 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.7 + * libxfce4ui now needs libxfce4util >= 4.15.6 + * Update configure.ac.in syntax + * Namespace of the gir needs capital first letter + * Remove hardcoded translators list + * Bump libepoxy version to 1.2 + * Translation Updates +- Rename typelib subpackage to match gir name + +------------------------------------------------------------------- +Sun Dec 13 20:41:19 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.6 + * Introduce xfce_spawn and xfce_spawn_command_line + in favor and instead of xfce_spawn_no_child + * Bump GLib (and gio, gthread, etc) minimum to 2.50.0 + * about: Support multiple GPUs and print GPU memory size + * about: Drop window subtitle + * Always perform sanity check + * Avoid checking for epoxy if libgtop is disabled + * XfceTitledDialog: Fix erroneous check (gxo#xfce/libxfce4ui#30) + * No startup notification in Wayland to prevent crash + (gxo#xfce/libxfce4ui#17) + * Translation Updates + +------------------------------------------------------------------- +Fri Nov 20 15:01:22 UTC 2020 - Maurizio Galli + +- Fix dependencies and add introspection for vala bindings + +------------------------------------------------------------------- +Thu Nov 19 17:03:10 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.5 + * Add new API xfce_spawn_no_child (gxo#xfce/libxfce4ui!8): + Launch processes re-parenting them to init vs. as children + * about: Fix icon names + * about: Display userspace bitness if it differs from OS kernel + bitness + * about: Print GPU name in system info + * about: Use more understandable arch labels + (gxo#xfce/libxfce4ui#27) + * Improve xfce_icon_name API + * No startup notification in wayland to prevent crash + (gxo#xfce/libxfce4ui#17) + * Add missing docstring + * Fix typos + * Add README.md to EXTRA_DIST + * Translation Updates + +------------------------------------------------------------------- +Tue Nov 3 19:20:57 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.4 + * Avoid redundant key re-grabbing + * Adds new README.md and updates AM_INIT_AUTOMAKE + * Silence compiler warnings (gxo#xfce/libxfce4ui#25) + * AC_CONFIG_MACRO_DIR → AC_CONFIG_MACRO_DIRS + * Add default shortcuts for tiling (gxo#xfce/libxfce4ui#4) + * Avoid shortening the keycodes GArray while walking it. + * about: Revamp About Xfce tab + * about: More icon name fixes + * Add more logo icons and new about icon + * Update deprecated icon names + * keyboard-shortcuts: Improve UI for setting shortcuts + * shortcut-dialog: Add label to clear button + * shortcut-dialog: Port to new XfceTitledDialog API + * shortcut-dialog: Only grab keyboard + * Always return GTK_RESPONSE_OK for accepted shortcut keys + (gxo#xfce/libxfce4ui#20) + * Translation Updates + +------------------------------------------------------------------- +Fri Aug 28 14:42:24 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.3 + * Update bug URLs to point to gitlab.xfce + * xfce-about: Hide empty email address tags (gxo#xfce/libxfce4ui#12) + * Remove translator email address as per request + (gxo#xfce/libxfce4ui#11) + * Add missing translator to xfce4-about (gxo#xfce/libxfce4ui#18) + * Replace deprecated 'gdk_keyboard_ungrab' function + (gxo#xfce/libxfce4ui#15) + * shortcuts-grabber: Correctly ungrab keys on updating shortcuts + (gxo#xfce/libxfce4ui#16) + * Allow more granular control over menu item accelerators. + * No automatic accelerator activation formenu items + * Added 'gtk_menu_item_set_accel_label' + * Added 'xfce_gtk_accel_group_connect_action_entries' + * renamed 'xfce_gtk_accel_group_append' to + 'xfce_gtk_accel_map_add_entries' and modified internals accordingly. + * No automatic add to an accel_group any more, since this may + lead to double-activation in some cases. + * Add "xfce_gtk_accel_group_disconnect_action_entries" to be + able to revert "xfce_gtk_accel_group_connect_action_entries" + * Add title to xfce_dialog_confirm_close_tabs + * Add new methods to libxfce4ui.symbols. + * Introduced 'XfceGtkActionEntry' as replacement for the deprecated + 'GtkAction', 'GtkActionEntry' in order to keep simple menu creation. + This includes various support methods, like: + - 'xfce_gtk_translate_action_entries' to to translate a list of + XfceGtkActionEntrys + - 'xfce_gtk_accel_group_append' to register the provided accelerators + of the entries + - 'xfce_gtk_get_action_entry_by_id' to find a single XfceGtkActionEntry, + e.g. by using a enumeration + - 'xfce_gtk_***_new_from_action_entry' to createthe specific menu- + or tool-items from an XfceGtkActionEntry + * Add a widget for filename input (bxo#16542) + * Enabled doc generation for XfceGtkActionEntry and related methods + * Enabled doc generation for new widget 'xfce-filename-input' + * Switch Ctrl+Alt+Del to xfce4-session-logout (bxo#11979) + * Add more default keyboard shortcuts (bxo#16470) + * shortcuts: Replace xfrun4 by xfce4-appfinder + * shortcuts: Also map Homepage to browser + * shortcuts: Remove calculator shortcut + * Switch XfceTitledDialog to headerbar/CSD layout + * Use GtkMessageDialog as base class for Xfce Dialogs + * Add two new functions to search for app icons + * Improve Tests and Docs + * Switch XfceTitledDialog to headerbar layout + * XfceTitledDialog: Keep buttons in the action area + * XfceTitledDialog: Also repack xfce_titled_dialog_new + * XfceTitledDialog: Make sure windows can be dragged + * XfceTitledDialog: Add _create_action_area, _add_button + * and _add_action_widget + * Introduce xfce_titled_dialog_set_default_response + * Mark xfce_titled_dialog_new_with_buttons as deprecated + * Add two new functions to search for app icons + * xfce-about: Fix Makefile + * shortcut-dialog: Show dialog content (bxo#16338) + * xfce-dialogs: Use GtkMessageDialog as base class + * xfce-dialogs: Improve layout of confirm_close_tabs + * xfce-dialogs: Improve alignment and layout of dialogs + * xfce-dialogs: Add right margin back to labels + * xfce-dialogs: Drop default window titles + * docs: Add xfce_dialog_confirm_close_tabs + * tests: Add xfce_dialog_confirm_close_tabs + * tests: Improve UI + * tests: Add icons to dialog buttons + * tests: Simplify code by using XfceTitledDialog + * tests: Re-order buttons + * tests: Fix typo in test-ui.c (bxo#16253) + * Rename test-ui-gtk3 to test-ui + * Improve docstrings + * Drop gladeui Gtk2 from distcheck options + * Drop unused declaration + * Fix compiler warnings + * Remove trailing whitespace + * Always provides needed files for vala binding in dist tarball + * Add recents functions to libxfce4ui.symbols + * Drop xfce-header from pot files + * Update docstrings + * Fix license text box too small (bxo#16259) + * .gitignore: ignore all .o files + * Make autogen output friendlier + * Drop support for Gtk2 + * Make glibtop an optional dependency ("About System" tab) + * about: Add system info tab + * about: Hide system tab conditionally + * dialogs: Use symbolic window-close icon + * Fix Window not visible when grabbing keyboard (bxo#16054) + * Bump Gtk3 to 3.22 (bxo#15781) + * Do not use gdk_screen_get_monitor_at_point (bxo#15781) + * Replace gtk_show_uri (bxo#15781) + * Replace gdk_display_get_screen (bxo#15781) + * Replace gdk_keymap_get_default (bxo#15781) + * Replace deprecated device functions (bxo#15781) + * Replace gdk_error_trap_* and gdk_flush (bxo#15781) + * Ignore what is hard to replace (bxo#15781) + * Add a dialog to confirm closure of multiple tabs (bxo#15873) + * Translation Updates + ------------------------------------------------------------------- Fri Aug 16 12:47:48 UTC 2019 - Maurizio Galli diff --git a/libxfce4ui.spec b/libxfce4ui.spec index afb34f6..97522e4 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -1,7 +1,7 @@ # # spec file for package libxfce4ui # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,37 +17,41 @@ %bcond_with git -%define libname_gtk2 libxfce4ui-1-0 %define libname_gtk3 libxfce4ui-2-0 Name: libxfce4ui -Version: 4.14.1 +Version: 4.16.0 Release: 0 Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1-or-later Group: System/Libraries URL: https://www.xfce.org/ -Source0: https://archive.xfce.org/src/xfce/libxfce4ui/4.14/%{name}-%{version}.tar.bz2 +Source0: https://archive.xfce.org/src/xfce/libxfce4ui/4.16/%{name}-%{version}.tar.bz2 # needed until all applications have been ported to xfce_dialog_show_help() or # an alternative mechanism Source1: xfhelp4.sh +# PATCH-FEATURE-OPENSUSE xfdesktop-backgrounds-path.patch mauriziogalli@opensuse.org -- Workaround to remove subtitles area in Xfce applications headerbar +Patch0: headerbar_subtitle.patch BuildRequires: fdupes BuildRequires: intltool -BuildRequires: update-desktop-files BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libgtop-2.0) >= 2.24.0 BuildRequires: pkgconfig(libstartup-notification-1.0) -BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.12 -BuildRequires: pkgconfig(libxfconf-0) >= 4.12 +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.15.6 +BuildRequires: pkgconfig(libxfconf-0) >= 4.14 BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(x11) %if %{with git} +BuildRequires: gtk-doc BuildRequires: xfce4-dev-tools %endif @@ -55,23 +59,6 @@ BuildRequires: xfce4-dev-tools The libxfce4ui library provides a number of widgets commonly used by Xfce applications. -%package -n %{libname_gtk2} -Summary: Widgets Library for the Xfce Desktop Environment -# uses exo-open -License: GPL-2.0-or-later -Group: System/Libraries -Requires: exo-tools -# -branding only contains keyboard shortcuts for some libxfce4ui consumers so -# it is not really a dependency but it must be dragged in at a low level -Recommends: %{name}-branding = %{version} -Recommends: %{name}-lang = %{version} -Provides: libxfce4ui = %{version} -Obsoletes: libxfce4ui <= 4.8.1 - -%description -n %{libname_gtk2} -The libxfce4ui library provides a number of widgets commonly used by Xfce -applications. This package provides the GTK 2 variant of libxfce4ui. - %package -n %{libname_gtk3} Summary: Widgets Library for the Xfce Desktop Environment # uses exo-open @@ -99,7 +86,6 @@ This package provides tools from libxfce4ui. Summary: Development Files for the libxfce4ui Library License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Requires: %{libname_gtk2} = %{version} Requires: %{libname_gtk3} = %{version} Recommends: %{name}-doc = %{version} @@ -120,7 +106,6 @@ This package provides the documentation for the libxfce4ui library. Summary: Upstream Branding of libxfce4ui License: GPL-2.0-or-later Group: System/GUI/XFCE -Supplements: packageand(%{libname_gtk2}:branding-upstream) Supplements: packageand(%{libname_gtk3}:branding-upstream) # BRAND: xfce4-keyboard-shortcuts.xml: Controls the global keyboard shortcuts # BRAND: for the Xfce desktop. @@ -136,7 +121,6 @@ This package provides the upstream look and feel for libxfce4ui. Summary: Languages for package %{name} License: LGPL-2.1-or-later Group: System/Localization -Requires: %{libname_gtk2} = %{version} Requires: %{libname_gtk3} = %{version} Provides: %{name}-lang-all = %{version} Supplements: packageand(bundle-lang-other:%{libname_gtk2}) @@ -146,8 +130,19 @@ BuildArch: noarch %description lang Provides translations to the package %{name} +%package -n typelib-1_0-Libxfce4ui-2_0 +Summary: UI Library for the Xfce Desktop Environment +License: LGPL-2.1-or-later +Group: System/Libraries +Provides: typelib-1_0-libxfce4ui-2_0 = %{version} +Obsoletes: typelib-1_0-libxfce4ui-2_0 < %{version} + +%description -n typelib-1_0-Libxfce4ui-2_0 +The libxfce4ui library provides a number of widgets commonly used by Xfce +applications. + %prep -%autosetup +%autosetup -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -157,12 +152,14 @@ NOCONFIGURE=1 ./autogen.sh --enable-maintainer-mode \ --enable-startup-notification \ --with-vendor-info=openSUSE \ - --disable-static + --disable-static \ + --enable-vala=yes %else %configure \ --enable-startup-notification \ --with-vendor-info=openSUSE \ - --disable-static + --disable-static \ + --enable-vala=yes %endif %make_build @@ -182,23 +179,13 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %fdupes %{buildroot}%{_includedir} -%post -n %{libname_gtk2} -p /sbin/ldconfig - -%postun -n %{libname_gtk2} -p /sbin/ldconfig - %post -n %{libname_gtk3} -p /sbin/ldconfig %postun -n %{libname_gtk3} -p /sbin/ldconfig -%files -n %{libname_gtk2} -%license COPYING -%doc AUTHORS NEWS README THANKS TODO -%{_libdir}/libxfce4ui-1.so.* -%{_libdir}/libxfce4kbd-private-2.so.* - %files -n %{libname_gtk3} %license COPYING -%doc AUTHORS NEWS README THANKS TODO +%doc AUTHORS NEWS THANKS TODO %{_libdir}/libxfce4ui-2.so.* %{_libdir}/libxfce4kbd-private-3.so.* @@ -208,16 +195,16 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %{_libdir}/libxfce4kbd-private-*.so %{_libdir}/pkgconfig/libxfce4ui-*.pc %{_libdir}/pkgconfig/libxfce4kbd-private-*.pc -%{_includedir}/xfce4/libxfce4ui-1/ %{_includedir}/xfce4/libxfce4ui-2/ -%{_includedir}/xfce4/libxfce4kbd-private-2/ %{_includedir}/xfce4/libxfce4kbd-private-3/ +%{_datadir}/vala/vapi/ +%{_datadir}/gir-1.0/Libxfce4ui-2.0.gir %files tools %{_bindir}/xfhelp4 %{_bindir}/xfce4-about %{_datadir}/applications/xfce4-about.desktop -%{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png +%{_datadir}/icons/hicolor/*/apps/{org.xfce.about.*,xfce4-logo.*} %files doc %doc %{_datadir}/gtk-doc/html/libxfce4ui/ @@ -228,4 +215,7 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +%files -n typelib-1_0-Libxfce4ui-2_0 +%{_libdir}/girepository-1.0/Libxfce4ui-2.0.typelib + %changelog