From patchwork Thu Feb 22 16:10:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60887 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 34E7427BBE9; Thu, 22 Feb 2024 16:17:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AA16527BBEA for ; Thu, 22 Feb 2024 16:17:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBko-0003gP-Rm; Thu, 22 Feb 2024 11:16:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdBkb-0003Pf-N4 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:47 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdBkb-0004cH-DT for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBky-0003Ul-9h for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 12/20] gnu: autotrace: Fix pkg-config file. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861858913204 (code B ref 68813); Thu, 22 Feb 2024 16:17:08 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:29 +0000 Received: from localhost ([127.0.0.1]:38602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkJ-0003Qd-5V for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:28 -0500 Received: from mail-qv1-f54.google.com ([209.85.219.54]:60837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkC-0003Oz-N6 for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:21 -0500 Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-68f4bad3cb3so23025166d6.1 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618492; x=1709223292; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PHI3UplwEgcgDK9sHAW5OxIkaWenlwpOiTtlgk7IbWc=; b=az1/Cr0FBwFoFlBEuRSulyXmNqQTbVkxZPt/LuqlsJk9H8Zy87/yJi0KEUFgZTVzYo 4mvkkioyngEMCzuQpuJYtV0JWowhp2UAjYS8NCgEew+H0y4nuf4mixN4cuot76qYdemv T1A80z1xWwxqjZTHI+J8XhbIdopc0lw+m5fme5f4E7ev5wHvP7DMybZjguensaB180Oo E+Hlzl9DPtGz9sZwbYKyvrrHc00ASeJnW+I633BDIcjnVI10Hc9gldDLOFB9UgjgEVaP ba9JvfWWaUDEFan/1RVWExsIUj4hZQYFCFZtPbIbLsRwbskz6UD34PZQSvdiyjz+vMAB 8BSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618492; x=1709223292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PHI3UplwEgcgDK9sHAW5OxIkaWenlwpOiTtlgk7IbWc=; b=X+i/C0ahtvUyofEMFpL1yJTgQvLK+J/bn4uzwbNExwT7RLr01jlHx1lYApEwkUBcQM FpzU9r4bNIFPhIUZJI7wgiHVUfBnYW80clfnBN8yU0ybo53F74dCwnpi/OhQptzDy9Cp 9Igql0Lm1WZlwTTQ1czhn7GW6uMuZhyU3F8GE4r+lUxmhB0odaZIQDDZXqsiA82OJ05l utfJt6WJzoFV0ECqWGSSgXH8BBBgDjw8bePslzuXwqsKs1KLdmUfgrctkrYHvKhXooJq 4Wtvg15y1SnpLwi8ifhYyj70iwx2KScsDvY4eGPb6VCdyl2SW8VP5czItewxCKjGMRkF rgMw== X-Gm-Message-State: AOJu0YzlMBzdBiLGBbxxpOecj0yk2gCST5sDZYUC1QV7VRM+r7gnnnVm wy3DEL2wYEEAbxQDVQ3Jvao7/p4Odxy52BBFM3QBSQ6xxvWJHyZEf7Ps3i4m X-Google-Smtp-Source: AGHT+IFcYsMsWrEaIDm7d1obKrLwV3wGdwSFH/WmCkeGCfspDxE00jrVOVpXNn9ulQzva5FYfTEE2g== X-Received: by 2002:a0c:e314:0:b0:68f:19a7:dd91 with SMTP id s20-20020a0ce314000000b0068f19a7dd91mr23751977qvl.2.1708618492042; Thu, 22 Feb 2024 08:14:52 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:51 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:11 -0500 Message-ID: <3e8e430a00b87e5980b15b128a5dec144d16c120.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/autotrace-pkg-config.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/graphics.scm (autotrace) [source]: Apply it. Change-Id: Id2086a5e1e1faa48d16ee8faae6960aaf7602321 --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 3 +- .../patches/autotrace-pkg-config.patch | 123 ++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/autotrace-pkg-config.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9db2e39c45..c072d5af85 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -956,6 +956,7 @@ dist_patch_DATA = \ %D%/packages/patches/audiofile-hurd.patch \ %D%/packages/patches/audiofile-function-signature.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ + %D%/packages/patches/autotrace-pkg-config.patch \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fa33dce747..01cd55f33b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -391,7 +391,8 @@ (define-public autotrace (file-name (git-file-name name version)) (sha256 (base32 - "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x")))) + "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x")) + (patches (search-patches "autotrace-pkg-config.patch")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~'("--disable-static") diff --git a/gnu/packages/patches/autotrace-pkg-config.patch b/gnu/packages/patches/autotrace-pkg-config.patch new file mode 100644 index 0000000000..eef1008bf2 --- /dev/null +++ b/gnu/packages/patches/autotrace-pkg-config.patch @@ -0,0 +1,123 @@ +Submitted upstream: https://github.com/autotrace/autotrace/pull/128 + +diff --git a/Makefile.am b/Makefile.am +index ea6eadd..cd9de37 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -127,7 +127,18 @@ autotraceinclude_HEADERS=\ + src/exception.h \ + src/color.h + +-libautotrace_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++libautotrace_la_LDFLAGS = \ ++ -version-info \ ++ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ $(GRAPHICSMAGICK_LIBS) \ ++ $(IMAGEMAGICK_LIBS) \ ++ $(LIBPNG_LIBS) \ ++ $(LIBSWF_LIBS) \ ++ $(LIBPSTOEDIT_LIBS) \ ++ $(GLIB2_LIBS) \ ++ $(POPT_LIBS) \ ++ $(INTLLIBS) \ ++ -lm + + # + # noinst_HEADERS: headers shared between lib and bin. +@@ -143,17 +154,7 @@ autotrace_SOURCES=\ + + AM_CPPFLAGS = $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(LIBPSTOEDIT_CFLAGS) $(LIBSWF_CFLAGS) $(GLIB2_CFLAGS) -DLOCALEDIR=\""$(datadir)/locale"\" + +-autotrace_LDADD = \ +- libautotrace.la \ +- $(GRAPHICSMAGICK_LIBS) \ +- $(IMAGEMAGICK_LIBS) \ +- $(LIBPNG_LIBS) \ +- $(LIBSWF_LIBS) \ +- $(LIBPSTOEDIT_LIBS) \ +- $(GLIB2_LIBS) \ +- $(POPT_LIBS) \ +- $(INTLLIBS) \ +- -lm ++autotrace_LDADD = libautotrace.la + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA= autotrace.pc +diff --git a/autotrace.pc.in b/autotrace.pc.in +index 4c2e581..c70808e 100644 +--- a/autotrace.pc.in ++++ b/autotrace.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: Autotrace + Description: a utility that converts bitmap to vector graphics + Version: @VERSION@ +-Requires: +-Libs: -L@libdir@ -lautotrace @LIBPNG_LIBS@ @MAGICK_LIBS@ @LIBSWF_LIBS@ @LIBPSTOEDIT_LIBS@ @GLIB2_LIBS@ +-Cflags: -I@includedir@ @MAGICK_CFLAGS@ @LIBPSTOEDIT_CFLAGS@ @GLIB2_CFLAGS@ ++Requires.private: glib-2.0 >= 2.0 gmodule-2.0 >= 2.0 gthread-2.0 >= 2.0 gobject-2.0 >= 2.0 @REQUIRES_PRIVATE@ ++Libs: -L@libdir@ -lautotrace ++Cflags: -I@includedir@ +diff --git a/configure.ac b/configure.ac +index 43b6fea..e6cf262 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -85,7 +85,8 @@ else + if test "x${with_magick}" = xGraphicsMagick; then + PKG_CHECK_MODULES([GRAPHICSMAGICK], + [GraphicsMagick >= 1.3.40], +- [HAVE_MAGICK=yes ++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}GraphicsMagick >= 1.3.40 " ++ HAVE_MAGICK=yes + HAVE_GRAPHICSMAGICK=yes + MAGICK_LIBRARY=GraphicsMagick + AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick library is available.]) +@@ -97,13 +98,15 @@ else + if test "x${with_magick}" = xImageMagick; then + PKG_CHECK_MODULES([IMAGEMAGICK7], + [ImageMagick >= 7.0.1], +- [HAVE_IMAGEMAGICK7=yes ++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 7.0.1 " ++ HAVE_IMAGEMAGICK7=yes + AC_DEFINE(HAVE_IMAGEMAGICK7, 1, [ImageMagick version 7 or higher is available.]) + ],[] + ) + PKG_CHECK_MODULES([IMAGEMAGICK], + [ImageMagick >= 5.2.1], +- [HAVE_MAGICK=yes ++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 5.2.1 " ++ HAVE_MAGICK=yes + HAVE_IMAGEMAGICK=yes + MAGICK_LIBRARY=ImageMagick + AC_DEFINE(HAVE_IMAGEMAGICK, 1, [ImageMagick library is available.]) +@@ -140,6 +143,7 @@ HAVE_LIBPNG=no + if test "x${with_png}" = xyes; then + PKG_CHECK_MODULES([LIBPNG],[libpng], + [ ++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libpng " + HAVE_LIBPNG=yes + AC_DEFINE(HAVE_LIBPNG,1,[PNG library is available or not]) + ], +@@ -165,6 +169,7 @@ if test "${swf_header_found}" = yes ; then + PKG_CHECK_MODULES([LIBSWF], + [libming], + [ ++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libming " + HAVE_LIBSWF=yes + AC_DEFINE(HAVE_LIBSWF,1,[SWF library is available or not]) + ], +@@ -187,6 +192,7 @@ if test "x${with_pstoedit}" = xyes; then + PKG_CHECK_MODULES([LIBPSTOEDIT], + [pstoedit >= 3.32.0], + [ ++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}pstoedit >= 3.32.0 " + HAVE_LIBPSTOEDIT=yes + AC_DEFINE(HAVE_LIBPSTOEDIT,1,[pstoedit library is available or not]) + ], +@@ -210,6 +216,7 @@ fi + + dnl po/Makefile.in FIXME FIXME FIXME + AC_CONFIG_FILES([po/Makefile.in Makefile autotrace.pc]) ++AC_SUBST([REQUIRES_PRIVATE]) + AC_OUTPUT + + echo "