summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaël Bonithon <gael@xfce.org>2021-12-24 19:11:51 +0100
committerGaël Bonithon <gael@xfce.org>2021-12-26 18:29:15 +0100
commit851a63ce087fe27c23bc625c25a4c0a9c976e895 (patch)
tree017534f8f6d6bd2026e6e5e762bdadcdbf037c56
parent59f9a132b5da72600af9701c9a6a9265a179b660 (diff)
downloadtumbler-851a63ce087fe27c23bc625c25a4c0a9c976e895.tar.gz
Cleanup: Remove deprecated GNOME build and TODO file
-rw-r--r--TODO20
-rwxr-xr-xautogen-gnome.sh44
-rwxr-xr-xautogen-xfce.sh32
-rwxr-xr-xautogen.sh31
-rw-r--r--m4macros/xdt-features.m4219
-rw-r--r--m4macros/xdt-i18n.m475
6 files changed, 11 insertions, 410 deletions
diff --git a/TODO b/TODO
deleted file mode 100644
index 9bfd582..0000000
--- a/TODO
+++ /dev/null
@@ -1,20 +0,0 @@
-Tumbler TODO List
-=================
-
- - convenience function in tumbler/tumbler-thumbnail.{c,h} to save
- pixbufs with thumbnail attributes, see
-
- http://jens.triq.net/thumbnail-spec/creation.html
-
- for more info.
-
- - create thumbnails (and directories) with the correct chmod bits set.
-
- - make it possible for thumbnailer plugins to notify the registry
- that their supported URI schemes and MIME types have changed (this
- is required for the ThunarVFS thumbnailer plugin to work).
-
- - create a utility library that wraps functionality like pixbuf
- loading, scaling, converting to TumblerImageData, as well as macros
- to write thumbnailer plugins with a single macro and thumbnailing
- function.
diff --git a/autogen-gnome.sh b/autogen-gnome.sh
deleted file mode 100755
index d6d694b..0000000
--- a/autogen-gnome.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# vi:set et ai sw=2 sts=2 ts=2: */
-# -
-# Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-export ACLOCAL_FLAGS="-I `pwd`/m4macros $ACLOCAL_FLAGS"
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="tumbler"
-REQUIRED_AUTOMAKE_VERSION=1.11
-
-(test -f $srcdir/configure.ac \
- && test -f $srcdir/README) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
- exit 1
-}
-
-# Automake requires that ChangeLog exist.
-touch ChangeLog
-
-which gnome-autogen.sh || {
- echo "You need to install gnome-common from the GNOME CVS"
- exit 1
-}
-. gnome-autogen.sh
diff --git a/autogen-xfce.sh b/autogen-xfce.sh
deleted file mode 100755
index 8a1c55f..0000000
--- a/autogen-xfce.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# vi:set et ai sw=2 sts=2 ts=2: */
-# -
-# Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-(type xdt-autogen) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
- your system, which are required to build this software.
- Please install the xfce4-dev-tools package first, it is available
- from http://www.xfce.org/.
-EOF
- exit 1
-}
-
-XDT_AUTOGEN_REQUIRED_VERSION="4.12.0" exec xdt-autogen $@
diff --git a/autogen.sh b/autogen.sh
index 8e8d1a5..9d2ba0e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,25 +19,16 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-test -d m4 || mkdir m4
-
-which xdt-autogen
-if test x"$?" = x"0"; then
- echo "Building using the Xfce development environment"
- ./autogen-xfce.sh $@
- exit $?
-fi
+type xdt-autogen >/dev/null 2>&1 || {
+ cat >&2 <<EOF
+autogen.sh: You don't seem to have the Xfce development tools installed on
+ your system, which are required to build this software.
+ Please install the xfce4-dev-tools package first, it is available
+ from http://www.xfce.org/.
+EOF
+ exit 1
+}
-which gnome-autogen.sh
-if test x"$?" = x"0"; then
- echo "Building using the GNOME development environment"
- ./autogen-gnome.sh $@
- exit $?
-fi
+mkdir -p m4 || exit $?
-cat >&2 <<EOF
-You need to have either the Xfce or the GNOME development enviroment
-installed. Check for xfce4-dev-tools or gnome-autogen.sh in your
-package manager.
-EOF
-exit 1
+XDT_AUTOGEN_REQUIRED_VERSION="4.16.0" exec xdt-autogen "$@"
diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4
deleted file mode 100644
index 239cd4f..0000000
--- a/m4macros/xdt-features.m4
+++ /dev/null
@@ -1,219 +0,0 @@
-dnl Copyright (c) 2002-2015
-dnl The Xfce development team. All rights reserved.
-dnl
-dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-dnl xdt-depends
-dnl -----------
-dnl Contains M4 macros to check for software dependencies.
-dnl Partly based on prior work of the XDG contributors.
-dnl
-
-
-
-dnl We need recent a autoconf version
-AC_PREREQ([2.60])
-
-
-dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS)
-dnl
-dnl For each token in FLAGS, checks to be sure the compiler supports
-dnl the flag, and if so, adds each one to VAR.
-dnl
-AC_DEFUN([XDT_SUPPORTED_FLAGS],
-[
- for flag in $2; do
- AC_MSG_CHECKING([if $CC supports $flag])
- saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $flag"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no])
- CFLAGS="$saved_CFLAGS"
- AC_MSG_RESULT([$flag_supported])
-
- if test "x$flag_supported" = "xyes"; then
- $1="$$1 $flag"
- fi
- done
-])
-
-
-
-dnl XDT_FEATURE_DEBUG(default_level=minimum)
-dnl
-AC_DEFUN([XDT_FEATURE_DEBUG],
-[
- dnl weird indentation to keep output indentation correct
- AC_ARG_ENABLE([debug],
- AC_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],
- [Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@])
-AC_HELP_STRING([--disable-debug], [Include no debugging support]),
- [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])])
-
- AC_MSG_CHECKING([whether to build with debugging support])
- if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
- AC_DEFINE([DEBUG], [1], [Define for debugging support])
-
- xdt_cv_additional_CFLAGS="-DXFCE_DISABLE_DEPRECATED \
- -Wall -Wextra \
- -Wno-missing-field-initializers \
- -Wno-unused-parameter -Wold-style-definition \
- -Wdeclaration-after-statement \
- -Wmissing-declarations \
- -Wmissing-noreturn -Wshadow -Wpointer-arith \
- -Wcast-align -Wformat -Wformat-security -Wformat-y2k \
- -Winit-self -Wmissing-include-dirs -Wundef \
- -Wnested-externs"
- CPPFLAGS="$CPPFLAGS"
-
- if test x`uname` = x"Linux"; then
- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
- fi
-
- dnl # signal.h inline is crapy on openbsd
- if test x`uname` != x"OpenBSD"; then
- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
- 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 -Werror"
- CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
- AC_MSG_RESULT([full])
- else
- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
- AC_MSG_RESULT([yes])
- fi
-
- XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS])
-
- 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"
- ])
-
- CFLAGS="$CFLAGS $supported_CFLAGS"
- CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS"
- else
- CPPFLAGS="$CPPFLAGS -DNDEBUG"
-
- if test x"$enable_debug" = x"no"; then
- CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
- AC_MSG_RESULT([no])
- else
- AC_MSG_RESULT([minimum])
- fi
- fi
-])
-
-
-dnl XDT_FEATURE_VISIBILITY()
-dnl
-dnl Checks to see if the compiler supports the 'visibility' attribute
-dnl If so, adds -DHAVE_GNUC_VISIBILTY to CPPFLAGS. Also sets the
-dnl automake conditional HAVE_GNUC_VISIBILITY.
-dnl
-AC_DEFUN([XDT_FEATURE_VISIBILITY],
-[
- AC_ARG_ENABLE([visibility],
- AC_HELP_STRING([--disable-visibility],
- [Don't use ELF visibility attributes]),
- [enable_visibility=$enableval], [enable_visibility=yes])
- have_gnuc_visibility=no
- if test "x$enable_visibility" != "xno"; then
- XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter])
- saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $xdt_vis_test_cflags"
- AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
- AC_COMPILE_IFELSE([AC_LANG_SOURCE(
- [
- void test_default (void);
- void test_hidden (void);
-
- void __attribute__ ((visibility("default"))) test_default (void) {}
- void __attribute__ ((visibility("hidden"))) test_hidden (void) {}
-
- int main (int argc, char **argv) {
- test_default ();
- test_hidden ();
- return 0;
- }
- ])],
- [
- have_gnuc_visibility=yes
- AC_MSG_RESULT([yes])
- ],
- [
- AC_MSG_RESULT([no])
- ])
- CFLAGS="$saved_CFLAGS"
- fi
-
- if test "x$have_gnuc_visibility" = "xyes"; then
- CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY"
- xdt_vis_hidden_cflags=""
- XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden])
- if test "x$xdt_vis_hidden_cflags" = "x"; then
- XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden])
- fi
- CFLAGS="$CFLAGS $xdt_vis_hidden_cflags"
- fi
-
- AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"])
-])
-
-dnl XDT_FEATURE_LINKER_OPTS
-dnl
-dnl Checks for and enables any special linker optimizations.
-dnl
-AC_DEFUN([XDT_FEATURE_LINKER_OPTS],
-[
- AC_ARG_ENABLE([linker-opts],
- AC_HELP_STRING([--disable-linker-opts],
- [Disable linker optimizations]),
- [enable_linker_opts=$enableval], [enable_linker_opts=yes])
-
- if test "x$enable_linker_opts" != "xno"; then
- if test x`uname` != x"OpenBSD"; then
- AC_MSG_CHECKING([whether $LD accepts --as-needed])
- case `$LD --as-needed -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- LDFLAGS="$LDFLAGS -Wl,--as-needed"
- AC_MSG_RESULT([yes])
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
- fi
- AC_MSG_CHECKING([whether $LD accepts -O1])
- case `$LD -O1 -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- LDFLAGS="$LDFLAGS -Wl,-O1"
- AC_MSG_RESULT([yes])
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
- fi
-])
diff --git a/m4macros/xdt-i18n.m4 b/m4macros/xdt-i18n.m4
deleted file mode 100644
index b296647..0000000
--- a/m4macros/xdt-i18n.m4
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl Copyright (c) 2002-2015
-dnl The Xfce development team. All rights reserved.
-dnl
-dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-dnl xdt-i18n
-dnl --------
-dnl Internalization M4 macros.
-dnl
-
-
-dnl XDT_I18N(LINGUAS [, PACKAGE])
-dnl
-dnl This macro takes care of setting up everything for i18n support.
-dnl
-dnl If PACKAGE isn't specified, it defaults to the package tarname; see
-dnl the description of AC_INIT() for an explanation of what makes up
-dnl the package tarname. Normally, you don't need to specify PACKAGE,
-dnl but you can stick with the default.
-dnl
-AC_DEFUN([XDT_I18N],
-[
- dnl Substitute GETTEXT_PACKAGE variable
- GETTEXT_PACKAGE=m4_default([$2], [AC_PACKAGE_TARNAME()])
- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Name of default gettext domain])
- AC_SUBST([GETTEXT_PACKAGE])
-
- dnl gettext and stuff
- ALL_LINGUAS="$1"
- AM_GLIB_GNU_GETTEXT()
-
- dnl This is required on some Linux systems
- AC_CHECK_FUNC([bind_textdomain_codeset])
-
- dnl Determine where to install locale files
- AC_MSG_CHECKING([for locales directory])
- AC_ARG_WITH([locales-dir],
- [
- AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
- ], [localedir=$withval],
- [
- if test x"$CATOBJEXT" = x".mo"; then
- localedir=$libdir/locale
- else
- localedir=$datadir/locale
- fi
- ])
- AC_MSG_RESULT([$localedir])
- AC_SUBST([localedir])
-
- dnl Determine additional xgettext flags
- AC_MSG_CHECKING([for additional xgettext flags])
- if test x"$XGETTEXT_ARGS" = x""; then
- XGETTEXT_ARGS="--keyword=Q_ --from-code=UTF-8";
- else
- XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=Q_ --from-code=UTF-8";
- fi
- AC_SUBST([XGETTEXT_ARGS])
- AC_MSG_RESULT([$XGETTEXT_ARGS])
-])
-