Compare commits
No commits in common. "rawhide" and "f30" have entirely different histories.
3 changed files with 18 additions and 481 deletions
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (xvattr-1.3.tar.gz) = f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0
|
||||
041e0d1f2ebce216e69e08ce78ec2ceb xvattr-1.3.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 12ad562345f9be462a44f1fb008a76e9507e4466 Mon Sep 17 00:00:00 2001
|
||||
From 1017e62f6f55d074d955e2920f9eded59b2211f5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 26 Oct 2015 14:07:56 +0100
|
||||
Subject: [PATCH] Make GTK tools optional
|
||||
|
|
@ -6,17 +6,11 @@ MIME-Version: 1.0
|
|||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Move AM_PATH_GTK macro to a separate file so that autoreconf -fi does
|
||||
not destroy it when gtk+ devel files are not available.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Makefile.am | 5 +-
|
||||
aclocal.m4 | 195 ---------------------------------------------------
|
||||
configure.in | 6 +-
|
||||
m4/gtk.m4 | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 204 insertions(+), 197 deletions(-)
|
||||
create mode 100644 m4/gtk.m4
|
||||
Makefile.am | 5 ++++-
|
||||
configure.in | 5 ++++-
|
||||
2 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 81bb95a..9159666 100644
|
||||
|
|
@ -33,219 +27,11 @@ index 81bb95a..9159666 100644
|
|||
xvattr_SOURCES = xvattr.c
|
||||
|
||||
xvattr_LDADD = $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lXext @LIBOBJS@
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index b298a8d..086e39e 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -491,198 +491,3 @@ else
|
||||
$1_FALSE=
|
||||
fi])
|
||||
|
||||
-# Configure paths for GTK+
|
||||
-# Owen Taylor 97-11-3
|
||||
-
|
||||
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
||||
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
|
||||
-dnl
|
||||
-AC_DEFUN(AM_PATH_GTK,
|
||||
-[dnl
|
||||
-dnl Get the cflags and libraries from the gtk-config script
|
||||
-dnl
|
||||
-AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
|
||||
- gtk_config_prefix="$withval", gtk_config_prefix="")
|
||||
-AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
|
||||
- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
|
||||
-AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
|
||||
- , enable_gtktest=yes)
|
||||
-
|
||||
- for module in . $4
|
||||
- do
|
||||
- case "$module" in
|
||||
- gthread)
|
||||
- gtk_config_args="$gtk_config_args gthread"
|
||||
- ;;
|
||||
- esac
|
||||
- done
|
||||
-
|
||||
- if test x$gtk_config_exec_prefix != x ; then
|
||||
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
||||
- if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
||||
- fi
|
||||
- fi
|
||||
- if test x$gtk_config_prefix != x ; then
|
||||
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
||||
- if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
|
||||
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
|
||||
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
|
||||
- no_gtk=""
|
||||
- if test "$GTK_CONFIG" = "no" ; then
|
||||
- no_gtk=yes
|
||||
- else
|
||||
- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
|
||||
- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
|
||||
- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
- if test "x$enable_gtktest" = "xyes" ; then
|
||||
- ac_save_CFLAGS="$CFLAGS"
|
||||
- ac_save_LIBS="$LIBS"
|
||||
- CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
- LIBS="$GTK_LIBS $LIBS"
|
||||
-dnl
|
||||
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
|
||||
-dnl checks the results of gtk-config to some extent
|
||||
-dnl
|
||||
- rm -f conf.gtktest
|
||||
- AC_TRY_RUN([
|
||||
-#include <gtk/gtk.h>
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-
|
||||
-int
|
||||
-main ()
|
||||
-{
|
||||
- int major, minor, micro;
|
||||
- char *tmp_version;
|
||||
-
|
||||
- system ("touch conf.gtktest");
|
||||
-
|
||||
- /* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
- tmp_version = g_strdup("$min_gtk_version");
|
||||
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
- printf("%s, bad version string\n", "$min_gtk_version");
|
||||
- exit(1);
|
||||
- }
|
||||
-
|
||||
- if ((gtk_major_version != $gtk_config_major_version) ||
|
||||
- (gtk_minor_version != $gtk_config_minor_version) ||
|
||||
- (gtk_micro_version != $gtk_config_micro_version))
|
||||
- {
|
||||
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
||||
- gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
- printf ("*** was found! If gtk-config was correct, then it is best\n");
|
||||
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
||||
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
||||
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
- printf("*** required on your system.\n");
|
||||
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
||||
- printf("*** before re-running configure\n");
|
||||
- }
|
||||
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
|
||||
- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
||||
- (gtk_minor_version != GTK_MINOR_VERSION) ||
|
||||
- (gtk_micro_version != GTK_MICRO_VERSION))
|
||||
- {
|
||||
- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
||||
- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
||||
- printf("*** library (version %d.%d.%d)\n",
|
||||
- gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
- }
|
||||
-#endif /* defined (GTK_MAJOR_VERSION) ... */
|
||||
- else
|
||||
- {
|
||||
- if ((gtk_major_version > major) ||
|
||||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
||||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
||||
- {
|
||||
- return 0;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
||||
- gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
||||
- major, minor, micro);
|
||||
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
||||
- printf("***\n");
|
||||
- printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
||||
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
||||
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
||||
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
- printf("*** so that the correct libraries are found at run-time))\n");
|
||||
- }
|
||||
- }
|
||||
- return 1;
|
||||
-}
|
||||
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
- CFLAGS="$ac_save_CFLAGS"
|
||||
- LIBS="$ac_save_LIBS"
|
||||
- fi
|
||||
- fi
|
||||
- if test "x$no_gtk" = x ; then
|
||||
- AC_MSG_RESULT(yes)
|
||||
- ifelse([$2], , :, [$2])
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- if test "$GTK_CONFIG" = "no" ; then
|
||||
- echo "*** The gtk-config script installed by GTK could not be found"
|
||||
- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
- echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
||||
- echo "*** full path to gtk-config."
|
||||
- else
|
||||
- if test -f conf.gtktest ; then
|
||||
- :
|
||||
- else
|
||||
- echo "*** Could not run GTK test program, checking why..."
|
||||
- CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
- LIBS="$LIBS $GTK_LIBS"
|
||||
- AC_TRY_LINK([
|
||||
-#include <gtk/gtk.h>
|
||||
-#include <stdio.h>
|
||||
-], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
||||
- [ echo "*** The test program compiled, but did not run. This usually means"
|
||||
- echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
||||
- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
|
||||
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
- echo "*** is required on your system"
|
||||
- echo "***"
|
||||
- echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
||||
- echo "***"
|
||||
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
||||
- echo "*** came with the system with the command"
|
||||
- echo "***"
|
||||
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
||||
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
||||
- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
||||
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
|
||||
- CFLAGS="$ac_save_CFLAGS"
|
||||
- LIBS="$ac_save_LIBS"
|
||||
- fi
|
||||
- fi
|
||||
- GTK_CFLAGS=""
|
||||
- GTK_LIBS=""
|
||||
- ifelse([$3], , :, [$3])
|
||||
- fi
|
||||
- AC_SUBST(GTK_CFLAGS)
|
||||
- AC_SUBST(GTK_LIBS)
|
||||
- rm -f conf.gtktest
|
||||
-])
|
||||
-
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 8c2eeb9..9a147ea 100644
|
||||
index 8c2eeb9..bd735b9 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1,3 +1,4 @@
|
||||
+AC_CONFIG_MACRO_DIRS([m4])
|
||||
AC_INIT(xvattr.c)
|
||||
AM_INIT_AUTOMAKE(xvattr, 1.3)
|
||||
|
||||
@@ -16,8 +17,11 @@ dnl Checks for X11
|
||||
@@ -16,8 +16,11 @@ dnl Checks for X11
|
||||
dnl
|
||||
AC_PATH_XTRA
|
||||
|
||||
|
|
@ -258,207 +44,6 @@ index 8c2eeb9..9a147ea 100644
|
|||
|
||||
dnl Checks for libraries.
|
||||
AC_ARG_WITH(xv-path,[ --with-xv-path=path Where libXv is installed],
|
||||
diff --git a/m4/gtk.m4 b/m4/gtk.m4
|
||||
new file mode 100644
|
||||
index 0000000..4211f1d
|
||||
--- /dev/null
|
||||
+++ b/m4/gtk.m4
|
||||
@@ -0,0 +1,195 @@
|
||||
+# Configure paths for GTK+
|
||||
+# Owen Taylor 97-11-3
|
||||
+
|
||||
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
||||
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
|
||||
+dnl
|
||||
+AC_DEFUN(AM_PATH_GTK,
|
||||
+[dnl
|
||||
+dnl Get the cflags and libraries from the gtk-config script
|
||||
+dnl
|
||||
+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
|
||||
+ gtk_config_prefix="$withval", gtk_config_prefix="")
|
||||
+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
|
||||
+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
|
||||
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
|
||||
+ , enable_gtktest=yes)
|
||||
+
|
||||
+ for module in . $4
|
||||
+ do
|
||||
+ case "$module" in
|
||||
+ gthread)
|
||||
+ gtk_config_args="$gtk_config_args gthread"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ done
|
||||
+
|
||||
+ if test x$gtk_config_exec_prefix != x ; then
|
||||
+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
||||
+ if test x${GTK_CONFIG+set} != xset ; then
|
||||
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
||||
+ fi
|
||||
+ fi
|
||||
+ if test x$gtk_config_prefix != x ; then
|
||||
+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
||||
+ if test x${GTK_CONFIG+set} != xset ; then
|
||||
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
|
||||
+ min_gtk_version=ifelse([$1], ,0.99.7,$1)
|
||||
+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
|
||||
+ no_gtk=""
|
||||
+ if test "$GTK_CONFIG" = "no" ; then
|
||||
+ no_gtk=yes
|
||||
+ else
|
||||
+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
|
||||
+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
|
||||
+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
+ if test "x$enable_gtktest" = "xyes" ; then
|
||||
+ ac_save_CFLAGS="$CFLAGS"
|
||||
+ ac_save_LIBS="$LIBS"
|
||||
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
+ LIBS="$GTK_LIBS $LIBS"
|
||||
+dnl
|
||||
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
|
||||
+dnl checks the results of gtk-config to some extent
|
||||
+dnl
|
||||
+ rm -f conf.gtktest
|
||||
+ AC_TRY_RUN([
|
||||
+#include <gtk/gtk.h>
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+ int major, minor, micro;
|
||||
+ char *tmp_version;
|
||||
+
|
||||
+ system ("touch conf.gtktest");
|
||||
+
|
||||
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
+ tmp_version = g_strdup("$min_gtk_version");
|
||||
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
+ printf("%s, bad version string\n", "$min_gtk_version");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ if ((gtk_major_version != $gtk_config_major_version) ||
|
||||
+ (gtk_minor_version != $gtk_config_minor_version) ||
|
||||
+ (gtk_micro_version != $gtk_config_micro_version))
|
||||
+ {
|
||||
+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
||||
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
+ printf ("*** was found! If gtk-config was correct, then it is best\n");
|
||||
+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
||||
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
||||
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
+ printf("*** required on your system.\n");
|
||||
+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
||||
+ printf("*** before re-running configure\n");
|
||||
+ }
|
||||
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
|
||||
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
||||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
|
||||
+ (gtk_micro_version != GTK_MICRO_VERSION))
|
||||
+ {
|
||||
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
||||
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
||||
+ printf("*** library (version %d.%d.%d)\n",
|
||||
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
+ }
|
||||
+#endif /* defined (GTK_MAJOR_VERSION) ... */
|
||||
+ else
|
||||
+ {
|
||||
+ if ((gtk_major_version > major) ||
|
||||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
||||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
||||
+ {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
||||
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
||||
+ major, minor, micro);
|
||||
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
||||
+ printf("***\n");
|
||||
+ printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
||||
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
||||
+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
||||
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
+ printf("*** so that the correct libraries are found at run-time))\n");
|
||||
+ }
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
+ CFLAGS="$ac_save_CFLAGS"
|
||||
+ LIBS="$ac_save_LIBS"
|
||||
+ fi
|
||||
+ fi
|
||||
+ if test "x$no_gtk" = x ; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ ifelse([$2], , :, [$2])
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ if test "$GTK_CONFIG" = "no" ; then
|
||||
+ echo "*** The gtk-config script installed by GTK could not be found"
|
||||
+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
||||
+ echo "*** full path to gtk-config."
|
||||
+ else
|
||||
+ if test -f conf.gtktest ; then
|
||||
+ :
|
||||
+ else
|
||||
+ echo "*** Could not run GTK test program, checking why..."
|
||||
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
+ LIBS="$LIBS $GTK_LIBS"
|
||||
+ AC_TRY_LINK([
|
||||
+#include <gtk/gtk.h>
|
||||
+#include <stdio.h>
|
||||
+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
||||
+ [ echo "*** The test program compiled, but did not run. This usually means"
|
||||
+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
||||
+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
|
||||
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
+ echo "*** is required on your system"
|
||||
+ echo "***"
|
||||
+ echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
||||
+ echo "***"
|
||||
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
||||
+ echo "*** came with the system with the command"
|
||||
+ echo "***"
|
||||
+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
||||
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
||||
+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
||||
+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
|
||||
+ CFLAGS="$ac_save_CFLAGS"
|
||||
+ LIBS="$ac_save_LIBS"
|
||||
+ fi
|
||||
+ fi
|
||||
+ GTK_CFLAGS=""
|
||||
+ GTK_LIBS=""
|
||||
+ ifelse([$3], , :, [$3])
|
||||
+ fi
|
||||
+ AC_SUBST(GTK_CFLAGS)
|
||||
+ AC_SUBST(GTK_LIBS)
|
||||
+ rm -f conf.gtktest
|
||||
+])
|
||||
+
|
||||
--
|
||||
2.34.1
|
||||
2.4.3
|
||||
|
||||
|
|
|
|||
68
xvattr.spec
68
xvattr.spec
|
|
@ -1,4 +1,4 @@
|
|||
%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} > 36)
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%global gxvattr 0
|
||||
%else
|
||||
%global gxvattr 1
|
||||
|
|
@ -7,9 +7,8 @@
|
|||
Summary: Utility for getting and setting Xv attributes
|
||||
Name: xvattr
|
||||
Version: 1.3
|
||||
Release: 55%{?dist}
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
Release: 38%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://www.dtek.chalmers.se/groups/dvd/
|
||||
Source: http://ajax.fedorapeople.org/%{name}/%{name}-%{version}.tar.gz
|
||||
# Normalize documentation encoding
|
||||
|
|
@ -41,7 +40,11 @@ Summary: GTK1-based GUI for Xv attributes
|
|||
GTK1-based GUI for inspecting and setting Xv attributes.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
# Convert man page to UTF-8
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
autoreconf --install --force
|
||||
|
||||
%build
|
||||
|
|
@ -51,10 +54,10 @@ autoreconf --install --force
|
|||
%else
|
||||
--disable-gtk
|
||||
%endif
|
||||
%{make_build}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%{make_install}
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
|
|
@ -69,57 +72,6 @@ autoreconf --install --force
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-55
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-54
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-53
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-52
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.3-51
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-50
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-49
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-48
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-47
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-46
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Mar 17 2022 Petr Pisar <ppisar@redhat.com> - 1.3-45
|
||||
- Disable gxvattr since Fedora 37
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-38
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue