diff options
| author | rin <rin@pkgsrc.org> | 2022-07-29 06:03:02 +0000 |
|---|---|---|
| committer | rin <rin@pkgsrc.org> | 2022-07-29 06:03:02 +0000 |
| commit | a5120f383fb00cc4b4a1ec5ee78b268f6bfc0cb2 (patch) | |
| tree | ce304b766fd57c8e143b43dcc1169e12640ba8e0 /wm | |
| parent | e5ceb41bdfacee83dcf0f06fcb2f8ed5e0747853 (diff) | |
| download | pkgsrc-a5120f383fb00cc4b4a1ec5ee78b268f6bfc0cb2.tar.gz | |
wm/3ddesktop: Fix for graphics/imlib2 update
Add minimal support to `pkg-config imlib2`; imlib2-config has been
dropped since imlib2-1.7.5.
Bump revision.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/3ddesktop/Makefile | 5 | ||||
| -rw-r--r-- | wm/3ddesktop/distinfo | 3 | ||||
| -rw-r--r-- | wm/3ddesktop/patches/patch-configure | 43 |
3 files changed, 48 insertions, 3 deletions
diff --git a/wm/3ddesktop/Makefile b/wm/3ddesktop/Makefile index 09648b31298..e16e5c64831 100644 --- a/wm/3ddesktop/Makefile +++ b/wm/3ddesktop/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2020/03/20 11:58:31 nia Exp $ +# $NetBSD: Makefile,v 1.38 2022/07/29 06:03:02 rin Exp $ # DISTNAME= 3ddesktop-0.2.9 -PKGREVISION= 13 +PKGREVISION= 14 CATEGORIES= wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=desk3d/} @@ -13,6 +13,7 @@ COMMENT= 3D Virtual Desktop Switcher GNU_CONFIGURE= yes USE_LANGUAGES= c c++ +USE_TOOLS+= pkg-config EGDIR= ${PREFIX}/share/examples/3ddesktop CONF_FILES= ${EGDIR}/3ddesktop.conf ${PKG_SYSCONFDIR}/3ddesktop.conf diff --git a/wm/3ddesktop/distinfo b/wm/3ddesktop/distinfo index a8cb8e0897e..61fc0bda408 100644 --- a/wm/3ddesktop/distinfo +++ b/wm/3ddesktop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2021/10/26 11:25:09 nia Exp $ +$NetBSD: distinfo,v 1.13 2022/07/29 06:03:02 rin Exp $ BLAKE2s (3ddesktop-0.2.9.tar.gz) = 0f09f382757b59506cf5705d8c96da6d18eacd8eeb22fad3d4d794d2bd161fd9 SHA512 (3ddesktop-0.2.9.tar.gz) = 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686 @@ -8,4 +8,5 @@ SHA1 (patch-ab) = e078b55d2a0fc7344f59dcbddd25644b31f8f201 SHA1 (patch-ad) = 3e24c98b58b27e2e7384bb96ece20cb604dd900f SHA1 (patch-config.cpp) = ccb6d582e7633e003a3f1a15e41d496084df134f SHA1 (patch-config.hpp) = 75e530ef6d024236a14a4e8e7f2fe44badc012d7 +SHA1 (patch-configure) = 273e1954e3723b77499400df5f2f094948638c96 SHA1 (patch-util.h) = 8207e3ffc523b56902860abac3a80dbe03abb6e2 diff --git a/wm/3ddesktop/patches/patch-configure b/wm/3ddesktop/patches/patch-configure new file mode 100644 index 00000000000..3b859155fdc --- /dev/null +++ b/wm/3ddesktop/patches/patch-configure @@ -0,0 +1,43 @@ +$NetBSD: patch-configure,v 1.1 2022/07/29 06:03:02 rin Exp $ + +Add minimal support to `pkg-config imlib2`; imlib2-config has been +dropped since imlib2-1.7.5. + +--- configure.orig 2005-06-26 23:22:29.000000000 +0900 ++++ configure 2022-07-29 02:48:34.036270117 +0900 +@@ -8112,22 +8112,20 @@ + echo "${ECHO_T}no" >&6 + fi + +-if test "$IMLIB2_CONFIG_IN_PATH" != yes; then +- echo "------- ERROR -------" +- echo "The imlib2-config development script was not found in your execute path." +- echo "You may have imlib2 installed somewhere not covered by your path." +- echo "" +- echo "If this is the case make sure you have the packages installed, AND" +- echo "that the imlib2-config script is in your execute path (see your" +- echo "shell's manual page on setting the \$PATH environment variable)." +- echo "---------------------" +- { { echo "$as_me:$LINENO: error: Fatal Error: no imlib2-config detected." >&5 +-echo "$as_me: error: Fatal Error: no imlib2-config detected." >&2;} +- { (exit 1); exit 1; }; } +- exit; ++if test "$IMLIB2_CONFIG_IN_PATH" = yes; then ++ imlib2_cflags=`imlib2-config --cflags` ++ imlib2_libs=`imlib2-config --libs` ++else ++ if pkg-config imlib2; then ++ imlib2_cflags=`pkg-config imlib2 --cflags` ++ imlib2_libs=`pkg-config imlib2 --libs` ++ else ++ { { echo "$as_me:$LINENO: error: Fatal Error: no imlib2 detected." >&5 ++ echo "$as_me: error: Fatal Error: no imlib2 detected." >&2;} ++ { (exit 1); exit 1; }; } ++ exit; ++ fi + fi +-imlib2_cflags=`imlib2-config --cflags` +-imlib2_libs=`imlib2-config --libs` + + + |