diff --git a/NEWS b/NEWS index 323aa10..a5a700a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +1.8.3 (2022-11-16) +===== +- Fix function called only in debug mode (Clear button works now) + + 1.8.2 (2022-09-19) ===== - Remove soon-to-be-deprecated exo-string functions diff --git a/aclocal.m4 b/aclocal.m4 index a521166..75ba63b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -638,6 +638,27 @@ AC_DEFUN([XDT_CHECK_PACKAGE], AC_SUBST([$1_LIBS]) AC_SUBST([$1_REQUIRED_VERSION]) + if test x"$1" = x"GLIB"; then + dnl Use GLib structured logging, see https://docs.gtk.org/glib/logging.html + dnl XFCE apps&libraries can override this setting after XDT_CHECK_PACKAGE(GLIB) + dnl using AC_DEFINE. + dnl Note that it requires GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56 to work + dnl properly in GLib logging macros (not documented, see glib/gmessages.h). + AC_DEFINE(G_LOG_USE_STRUCTURED, 1, [Use GLib structured logging]) + fi + + ifelse([$1], GLIB, [ + dnl Report uses of GLib functions newer than $3 as C compiler warnings. + dnl XFCE apps&libraries can override this setting after XDT_CHECK_PACKAGE(GLIB) + dnl using AC_DEFINE, in which case it is recommended to override both MAX and MIN. + AC_MSG_NOTICE([setting GLIB_VERSION_MAX_ALLOWED and GLIB_VERSION_MIN_REQUIRED according to $3]) + m4_pushdef([SUFFIX], translit($3, `.', `_')) + m4_define([SUFFIX], ifelse(regexp(SUFFIX, [[0-9]+_[0-9]+_[0-9]+]), -1, SUFFIX, patsubst(SUFFIX, [_[0-9]+$]))) + AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, m4_format(GLIB_VERSION_%s, SUFFIX), m4_format(Prevent post %s APIs, SUFFIX)) + AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, m4_format(GLIB_VERSION_%s, SUFFIX), m4_format(Ignore post %s APIs, SUFFIX)) + m4_popdef([SUFFIX]) + ]) + ifelse([$4], , , [$4]) elif $PKG_CONFIG --exists "$2" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "$2"` @@ -921,16 +942,15 @@ AC_DEFUN([XDT_FEATURE_DEBUG], AS_HELP_STRING([--disable-debug],[Include no debugging support]), [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])]) - dnl enable most warnings regardless of debug level - xdt_cv_additional_CFLAGS="-Wall -Wextra \ - -Wno-missing-field-initializers \ - -Wno-unused-parameter -Wold-style-definition \ - -Wdeclaration-after-statement \ - -Wmissing-declarations \ - -Wmissing-noreturn -Wpointer-arith \ - -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ - -Winit-self -Wmissing-include-dirs -Wundef \ - -Wnested-externs -Wredundant-decls" + dnl Enable most warnings regardless of debug level. Common flags for both C and C++. + xdt_cv_additional_COMMON_FLAGS="-Wall -Wextra \ + -Wno-missing-field-initializers \ + -Wno-unused-parameter \ + -Wmissing-declarations \ + -Wmissing-noreturn -Wpointer-arith \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ + -Winit-self -Wmissing-include-dirs -Wundef \ + -Wredundant-decls" AC_MSG_CHECKING([whether to build with debugging support]) if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then @@ -939,20 +959,20 @@ AS_HELP_STRING([--disable-debug],[Include no debugging support]), CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -fstack-protector" fi if test x"$enable_debug" = x"full"; then AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -O0 -g" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" AC_MSG_RESULT([full]) else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -g -Wshadow" AC_MSG_RESULT([yes]) fi else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wshadow" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -Wshadow" CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then @@ -963,18 +983,14 @@ AS_HELP_STRING([--disable-debug],[Include no debugging support]), fi fi - XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS]) + xdt_cv_additional_CFLAGS="$xdt_cv_additional_COMMON_FLAGS \ + -Wdeclaration-after-statement \ + -Wnested-externs \ + -Wold-style-definition" + xdt_cv_additional_CXXFLAGS="$xdt_cv_additional_COMMON_FLAGS" - ifelse([$CXX], , , [ - dnl FIXME: should test on c++ compiler, but the following line causes - dnl autoconf errors for projects that don't check for a - dnl c++ compiler at all. - dnl AC_LANG_PUSH([C++]) - dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS]) - dnl AC_LANG_POP() - dnl instead, just use supported_CFLAGS... - supported_CXXFLAGS="$supported_CFLAGS" - ]) + XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS]) + XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CXXFLAGS]) CFLAGS="$CFLAGS $supported_CFLAGS" CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS" diff --git a/config.h.in b/config.h.in index e039205..8075e31 100644 --- a/config.h.in +++ b/config.h.in @@ -9,6 +9,15 @@ /* Name of default gettext domain */ #undef GETTEXT_PACKAGE +/* Prevent post 2_50 APIs */ +#undef GLIB_VERSION_MAX_ALLOWED + +/* Ignore post 2_50 APIs */ +#undef GLIB_VERSION_MIN_REQUIRED + +/* Use GLib structured logging */ +#undef G_LOG_USE_STRUCTURED + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff --git a/configure b/configure index 7f926db..938a88b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for xfce4-places-plugin 1.8.2. +# Generated by GNU Autoconf 2.71 for xfce4-places-plugin 1.8.3. # # Report bugs to . # @@ -624,8 +624,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xfce4-places-plugin' PACKAGE_TARNAME='xfce4-places-plugin' -PACKAGE_VERSION='1.8.2' -PACKAGE_STRING='xfce4-places-plugin 1.8.2' +PACKAGE_VERSION='1.8.3' +PACKAGE_STRING='xfce4-places-plugin 1.8.3' PACKAGE_BUGREPORT='https://bugzilla.xfce.org/' PACKAGE_URL='' @@ -1471,7 +1471,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfce4-places-plugin 1.8.2 to adapt to many kinds of systems. +\`configure' configures xfce4-places-plugin 1.8.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1547,7 +1547,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-places-plugin 1.8.2:";; + short | recursive ) echo "Configuration of xfce4-places-plugin 1.8.3:";; esac cat <<\_ACEOF @@ -1683,7 +1683,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-places-plugin configure 1.8.2 +xfce4-places-plugin configure 1.8.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1942,7 +1942,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-places-plugin $as_me 1.8.2, which was +It was created by xfce4-places-plugin $as_me 1.8.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3215,7 +3215,7 @@ fi # Define the identity of the package. PACKAGE='xfce4-places-plugin' - VERSION='1.8.2' + VERSION='1.8.3' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -13566,6 +13566,26 @@ printf "%s\n" "$GLIB_LIBS" >&6; } + if test x"GLIB" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting GLIB_VERSION_MAX_ALLOWED and GLIB_VERSION_MIN_REQUIRED according to 2.50.0" >&5 +printf "%s\n" "$as_me: setting GLIB_VERSION_MAX_ALLOWED and GLIB_VERSION_MIN_REQUIRED according to 2.50.0" >&6;} + + + +printf "%s\n" "#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_50" >>confdefs.h + + +printf "%s\n" "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_50" >>confdefs.h + + + + elif $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "glib-2.0"` @@ -13771,6 +13791,14 @@ printf "%s\n" "$GIO_LIBS" >&6; } + if test x"GIO" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "gio-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gio-2.0"` @@ -13976,6 +14004,14 @@ printf "%s\n" "$GMODULE_LIBS" >&6; } + if test x"GMODULE" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "gmodule-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gmodule-2.0"` @@ -14181,6 +14217,14 @@ printf "%s\n" "$GOBJECT_LIBS" >&6; } + if test x"GOBJECT" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "gobject-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gobject-2.0"` @@ -14386,6 +14430,14 @@ printf "%s\n" "$GTHREAD_LIBS" >&6; } + if test x"GTHREAD" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "gthread-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gthread-2.0"` @@ -14591,6 +14643,14 @@ printf "%s\n" "$GTK_LIBS" >&6; } + if test x"GTK" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "gtk+-3.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-3.0"` @@ -14796,6 +14856,14 @@ printf "%s\n" "$LIBXFCE4UTIL_LIBS" >&6; } + if test x"LIBXFCE4UTIL" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` @@ -15001,6 +15069,14 @@ printf "%s\n" "$LIBXFCE4UI_LIBS" >&6; } + if test x"LIBXFCE4UI" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "libxfce4ui-2" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-2"` @@ -15206,6 +15282,14 @@ printf "%s\n" "$LIBXFCE4PANEL_LIBS" >&6; } + if test x"LIBXFCE4PANEL" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "libxfce4panel-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4panel-2.0"` @@ -15411,6 +15495,14 @@ printf "%s\n" "$EXO_LIBS" >&6; } + if test x"EXO" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "exo-2" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "exo-2"` @@ -15616,6 +15708,14 @@ printf "%s\n" "$XFCONF_LIBS" >&6; } + if test x"XFCONF" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` @@ -16760,6 +16860,14 @@ printf "%s\n" "$GIO_UNIX_LIBS" >&6; } + if test x"GIO_UNIX" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + printf "%s\n" "#define HAVE_GIO_UNIX 1" >>confdefs.h @@ -17007,6 +17115,14 @@ printf "%s\n" "$LIBNOTIFY_LIBS" >&6; } + if test x"LIBNOTIFY" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + printf "%s\n" "#define HAVE_LIBNOTIFY 1" >>confdefs.h @@ -17112,15 +17228,14 @@ else $as_nop fi - xdt_cv_additional_CFLAGS="-Wall -Wextra \ - -Wno-missing-field-initializers \ - -Wno-unused-parameter -Wold-style-definition \ - -Wdeclaration-after-statement \ - -Wmissing-declarations \ - -Wmissing-noreturn -Wpointer-arith \ - -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ - -Winit-self -Wmissing-include-dirs -Wundef \ - -Wnested-externs -Wredundant-decls" + xdt_cv_additional_COMMON_FLAGS="-Wall -Wextra \ + -Wno-missing-field-initializers \ + -Wno-unused-parameter \ + -Wmissing-declarations \ + -Wmissing-noreturn -Wpointer-arith \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ + -Winit-self -Wmissing-include-dirs -Wundef \ + -Wredundant-decls" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with debugging support" >&5 printf %s "checking whether to build with debugging support... " >&6; } @@ -17132,24 +17247,24 @@ printf "%s\n" "#define DEBUG 1" >>confdefs.h CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -fstack-protector" fi if test x"$enable_debug" = x"full"; then printf "%s\n" "#define DEBUG_TRACE 1" >>confdefs.h - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -O0 -g" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: full" >&5 printf "%s\n" "full" >&6; } else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -g -Wshadow" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } fi else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wshadow" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -Wshadow" CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then @@ -17162,6 +17277,12 @@ printf "%s\n" "minimum" >&6; } fi fi + xdt_cv_additional_CFLAGS="$xdt_cv_additional_COMMON_FLAGS \ + -Wdeclaration-after-statement \ + -Wnested-externs \ + -Wold-style-definition" + xdt_cv_additional_CXXFLAGS="$xdt_cv_additional_COMMON_FLAGS" + for flag in $xdt_cv_additional_CFLAGS; do { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 @@ -17189,8 +17310,30 @@ printf "%s\n" "$flag_supported" >&6; } done + for flag in $xdt_cv_additional_CXXFLAGS; do + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 +printf %s "checking if $CC supports $flag... " >&6; } + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - supported_CXXFLAGS="$supported_CFLAGS" +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + flag_supported=yes +else $as_nop + flag_supported=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS="$saved_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 +printf "%s\n" "$flag_supported" >&6; } + + if test "x$flag_supported" = "xyes"; then + supported_CXXFLAGS="$supported_CXXFLAGS $flag" + fi + done CFLAGS="$CFLAGS $supported_CFLAGS" @@ -17738,7 +17881,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-places-plugin $as_me 1.8.2, which was +This file was extended by xfce4-places-plugin $as_me 1.8.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17806,7 +17949,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xfce4-places-plugin config.status 1.8.2 +xfce4-places-plugin config.status 1.8.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1d328ac..affa9f2 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,9 @@ dnl xfce4-places-plugin dnl version info m4_define([places_version_major], [1]) m4_define([places_version_minor], [8]) -m4_define([places_version_micro], [2]) +m4_define([places_version_micro], [3]) m4_define([places_version_nano], []) dnl leave this empty to have no nano version -m4_define([places_version_build], [a35b757]) +m4_define([places_version_build], [7ff6551]) m4_define([places_version_tag], []) m4_define([places_version], [places_version_major().places_version_minor().places_version_micro()ifelse(places_version_nano(), [], [], [.places_version_nano()])ifelse(places_version_tag(), [git], [places_version_tag()-places_version_build()], [places_version_tag()])]) m4_define([places_default_debug], [ifelse(places_version_tag(), [git], [yes], [minimum])]) diff --git a/debian/changelog b/debian/changelog index dd04c61..a3cfc61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xfce4-places-plugin (1.8.2-ok2) yangtze; urgency=medium +xfce4-places-plugin (1.8.3-ok1) yangtze; urgency=medium - * fix to build. + * New upstream version 1.8.3 - -- rtlhq Fri, 16 Sep 2022 10:59:59 +0800 + -- rtlhq Sat, 26 Nov 2022 15:43:25 +0500 xfce4-places-plugin (1.8.2-ok1) yangtze; urgency=medium diff --git a/debian/control b/debian/control index 2432c9c..0cf30de 100644 --- a/debian/control +++ b/debian/control @@ -3,26 +3,28 @@ Section: xfce Priority: optional Maintainer: openKylin Xfce SIG Uploaders: rtlhq -Build-Depends: debhelper-compat (= 11), +Build-Depends: debhelper-compat (= 13), intltool, libexo-2-dev, libgtk-3-dev, libnotify-dev, libx11-dev, libxfce4panel-2.0-dev, - libxfce4ui-2-dev (>= 4.13), + libxfce4ui-2-dev, libxfce4util-dev, libxfconf-0-dev, pkg-config, xfce4-dev-tools -Standards-Version: 4.4.0 -Homepage: https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin +Rules-Requires-Root: no +Standards-Version: 4.6.1 +Homepage: https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start Vcs-Git: https://gitee.com/openkylin/xfce4-places-plugin.git Vcs-Browser: https://gitee.com/openkylin/xfce4-places-plugin Package: xfce4-places-plugin Architecture: any Depends: thunar, ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same Description: quick access to folders, documents and removable media This plugin brings much of the functionality of GNOME’s Places menu to Xfce. It puts a simple button on the panel. Clicking on this button opens up a menu diff --git a/debian/copyright b/debian/copyright index cffa17d..a881af5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Contact: Diego Ongaro +Upstream-Contact: Andre Miranda Upstream-Name: xfce4-places-plugin -Source: https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin +Source: https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/ Files: * Copyright: (C) 2007-2008 Diego Ongaro @@ -9,7 +9,7 @@ License: GPL-2.0+ Files: debian/* Copyright: (C) 2007 David Paleino - (C) 2008 Yves-Alexis Perez + (C) 2008 Yves-Alexis Perez License: GPL-2.0+ License: GPL-2.0+ diff --git a/debian/docs b/debian/docs index 535dcbf..6f77277 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,2 @@ -NEWS README.md TODO diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index 379f0f4..26ce54a --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,13 @@ #!/usr/bin/make -f -export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs +export DEB_LDFLAGS_MAINT_APPEND=-Wl,-O1 -Wl,-z,defs export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ -override_dh_auto_install: - dh_auto_install - find debian/xfce4-places-plugin -name '*.la' -delete +execute_after_dh_auto_install: + find debian -name '*.la' -delete + +override_dh_installchangelogs: + dh_installchangelogs NEWS diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..996b219 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +Bug-Database: https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/issues +Bug-Submit: https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/issues/new +Changelog: https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/commits/master +Documentation: https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start +Repository: https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin.git +Repository-Browse: https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin diff --git a/debian/watch b/debian/watch index b252114..4dd1074 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 -https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/([\d\.]+)/ \ - xfce4-places-plugin-([\d\.]+)\.tar\.(?:gz|bz2) +version=4 +https://archive.xfce.org/src/panel-plugins/@PACKAGE@/(\d[\d\.]+)/ \ + @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ diff --git a/panel-plugin/view.c b/panel-plugin/view.c index f657675..3f34cd9 100644 --- a/panel-plugin/view.c +++ b/panel-plugin/view.c @@ -445,8 +445,11 @@ static gboolean pview_cb_recent_items_clear(GtkWidget *clear_item, GtkWidget *recent_menu) { GtkRecentManager *manager = gtk_recent_manager_get_default(); - - DBG("Cleared %d recent items", gtk_recent_manager_purge_items(manager, NULL)); +#if defined(DEBUG) && DEBUG > 0 + gint removed = +#endif + gtk_recent_manager_purge_items(manager, NULL); + DBG("Cleared %d recent items", removed); pview_cb_recent_changed(manager, recent_menu);