/trunk/debian/changelog |
---|
1,10 → 1,3 |
pike8.0 (8.0.1116-1) unstable; urgency=low |
* New upstream release. |
* Drop freetype-pkgconfig.patch; now included upstream. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 31 Jan 2021 21:55:53 +0100 |
pike8.0 (8.0.702-1) unstable; urgency=low |
* New upstream release. |
/trunk/debian/patches/freetype-pkgconfig.patch |
---|
0,0 → 1,55 |
Description: Support recent versions of libfreetype that (only) provide pkg-config files |
Origin: upstream, http://pike-librarian.lysator.liu.se/index.xml?checkins=46adc327dea6d6d237a39d21bad2125b9b2501b1,4b8cdf2bc0586becc76fe725473395b63aa3caa5 |
Author: Henrik Grubbström (Grubba) <grubba@grubba.org> |
diff --git a/src/aclocal.m4 b/src/aclocal.m4 |
index 82d0288a1d..3f7551044b 100644 |
--- a/src/aclocal.m4 |
+++ b/src/aclocal.m4 |
@@ -1887,10 +1887,11 @@ AC_DEFUN(PIKE_LOW_PKG_CONFIG, |
$2="[$]$2 ${pkg_stuff}" |
]) |
-dnl package |
+dnl package, on_success_opt, on_failure_opt |
AC_DEFUN(PIKE_PKG_CONFIG, |
[ |
AC_REQUIRE([PIKE_PROG_PKG_CONFIG])dnl |
+ pike_cv_pkg_config_$1=no |
if test "${PKG_CONFIG}" = no; then :; else |
AC_MSG_CHECKING([if a pkg-config based $1 is installed]) |
if "${PKG_CONFIG}" "$1"; then |
@@ -1899,8 +1900,16 @@ AC_DEFUN(PIKE_PKG_CONFIG, |
PIKE_LOW_PKG_CONFIG([$1], [CFLAGS], [--cflags-only-other]) |
PIKE_LOW_PKG_CONFIG([$1], [LDFLAGS], [--libs-only-L]) |
PIKE_LOW_PKG_CONFIG([$1], [LIBS], [--libs-only-l --libs-only-other]) |
+ pike_cv_pkg_config_$1=yes |
else |
AC_MSG_RESULT(no) |
fi |
fi |
+ ifelse([$2$3], , , [ |
+ if test "x$pike_cv_pkg_config_$1" = "xno"; then |
+ ifelse([$3], , :, [$3]) |
+ else |
+ ifelse([$2], , :, [$2]) |
+ fi |
+ ]) |
]) |
diff --git a/src/modules/_Image_FreeType/configure.in b/src/modules/_Image_FreeType/configure.in |
index 1ce8abea8c..c3ac7f9a85 100644 |
--- a/src/modules/_Image_FreeType/configure.in |
+++ b/src/modules/_Image_FreeType/configure.in |
@@ -10,7 +10,11 @@ if test "x$with_freetype" = "xyes" ; then |
PIKE_FEATURE_NODEP(Image.FreeType) |
- MY_AC_PATH_PROGS(FT_CONFIG, ${ac_tool_prefix}freetype-config freetype-config, no) |
+ PIKE_PKG_CONFIG(freetype2, [ |
+ FT_CONFIG="${PKG_CONFIG} freetype2" |
+ ], [ |
+ MY_AC_PATH_PROGS(FT_CONFIG, ${pike_cv_tool_prefix}freetype-config ${ac_tool_prefix}freetype-config, no) |
+ ]) |
if test "$FT_CONFIG" = "no" ; then |
: |
/trunk/debian/patches/series |
---|
13,3 → 13,4 |
undefined_htons.patch |
bad_size_t_redef.patch |
dont_disable_debug_symbols.patch |
freetype-pkgconfig.patch |
/trunk/debian/patches/no_nostartfiles.patch |
---|
6,7 → 6,7 |
--- a/src/configure.in |
+++ b/src/configure.in |
@@ -7912,13 +7912,6 @@ if test -z "$LDSHARED" ; then |
@@ -7622,13 +7622,6 @@ if test -z "$LDSHARED" ; then |
ldshared_is_cc=no |
;; |
esac |
/trunk/debian/patches/hurd.patch |
---|
52,7 → 52,7 |
#endif |
--- a/src/configure.in |
+++ b/src/configure.in |
@@ -3263,7 +3263,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h |
@@ -3233,7 +3233,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h |
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \ |
stddef.h sys/termio.h sys/termios.h \ |
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \ |
61,7 → 61,7 |
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \ |
direct.h CoreServices/CoreServices.h execinfo.h \ |
mach/mach.h mach/thread_act.h mach/clock.h urcu.h \ |
@@ -7872,7 +7872,7 @@ if test -z "$LDSHARED" ; then |
@@ -7582,7 +7582,7 @@ if test -z "$LDSHARED" ; then |
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";; |
Linux*) LDSHARED="$REALCC -shared";; |
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";; |
72,7 → 72,7 |
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";; |
--- a/src/machine.h.in |
+++ b/src/machine.h.in |
@@ -946,6 +946,9 @@ |
@@ -912,6 +912,9 @@ |
/* Define to 1 if you have the <mach/mach_init.h> header file. */ |
#undef HAVE_MACH_MACH_INIT_H |
/trunk/debian/patches/pthread_stub.patch |
---|
5,7 → 5,7 |
--- a/src/configure.in |
+++ b/src/configure.in |
@@ -4046,6 +4046,9 @@ pthread_t gazonk; |
@@ -3937,6 +3937,9 @@ pthread_t gazonk; |
AC_MSG_CHECKING(for pthread_atfork) |
AC_CACHE_VAL(pike_cv_have_pthread_atfork,[ |
AC_TRY_LINK([#include <pthread.h> |
/trunk/debian/patches/unbreak_cross_compilation.patch |
---|
5,7 → 5,7 |
--- a/src/configure.in |
+++ b/src/configure.in |
@@ -475,7 +475,7 @@ if test "x$enable_binary" = "xno"; then |
@@ -472,7 +472,7 @@ if test "x$enable_binary" = "xno"; then |
RUNPIKE="USE_PIKE" |
RUNTPIKE="USE_PIKE" |
elif test "x$cross_compiling" = "xyes"; then |
14,7 → 14,7 |
RUNTPIKE="USE_PIKE" |
else |
RUNPIKE="DEFAULT_RUNPIKE" |
@@ -8133,7 +8133,7 @@ EOF |
@@ -7803,7 +7803,7 @@ EOF |
__attribute__ ((visibility("default"))) |
# endif |
void testfunc2(void) { exit(0); } |
/trunk/debian/patches/smartlink_verbose.patch |
---|
2,7 → 2,7 |
--- a/bin/smartlink |
+++ b/bin/smartlink |
@@ -224,7 +224,7 @@ case "$UNAME" in |
@@ -205,7 +205,7 @@ case "$UNAME" in |
;; |
esac |
/trunk/debian/patches/module-layout.patch |
---|
3,7 → 3,7 |
--- a/lib/master.pike.in |
+++ b/lib/master.pike.in |
@@ -1878,6 +1878,10 @@ protected void create() |
@@ -1827,6 +1827,10 @@ protected void create() |
add_module_path("#lib_prefix#/modules"); |
#endif |