From 32076310b7ebad909d8200759b88bea0fe6dc694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Nov 2021 13:03:18 +0700 Subject: [PATCH] gnac: disable old gnome-help format --- srcpkgs/gnac/patches/fix-debug-log.patch | 29 +++++++++++++++++++ srcpkgs/gnac/patches/no-gnome-doc-utils.patch | 20 +++++++++++++ srcpkgs/gnac/patches/no-po-check.patch | 7 +++++ srcpkgs/gnac/template | 6 ++-- 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnac/patches/fix-debug-log.patch create mode 100644 srcpkgs/gnac/patches/no-gnome-doc-utils.patch create mode 100644 srcpkgs/gnac/patches/no-po-check.patch diff --git a/srcpkgs/gnac/patches/fix-debug-log.patch b/srcpkgs/gnac/patches/fix-debug-log.patch new file mode 100644 index 00000000000..88fd15de6a5 --- /dev/null +++ b/srcpkgs/gnac/patches/fix-debug-log.patch @@ -0,0 +1,29 @@ +--- a/libgnac/libgnac-debug.h ++++ b/libgnac/libgnac-debug.h +@@ -32,7 +32,7 @@ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #define libgnac_debug(...) \ +- libgnac_debug_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) ++ libgnac_debug_real (__func__, __FILE__, __LINE__, __VA_ARGS__) + #elif defined(__GNUC__) && __GNUC__ >= 3 + #define libgnac_debug(...) \ + libgnac_debug_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) +@@ -42,7 +42,7 @@ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #define libgnac_warning(...) \ +- libgnac_warning_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) ++ libgnac_warning_real (__func__, __FILE__, __LINE__, __VA_ARGS__) + #elif defined(__GNUC__) && __GNUC__ >= 3 + #define libgnac_warning(...) \ + libgnac_warning_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) +@@ -52,7 +52,7 @@ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #define libgnac_critical(...) \ +- libgnac_critical_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) ++ libgnac_critical_real (__func__, __FILE__, __LINE__, __VA_ARGS__) + #elif defined(__GNUC__) && __GNUC__ >= 3 + #define libgnac_critical(...) \ + libgnac_critical_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) diff --git a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch new file mode 100644 index 00000000000..00f89a338db --- /dev/null +++ b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT + dnl Check for GSettings macros + GLIB_GSETTINGS + +-GNOME_DOC_INIT([0.17.2]) ++GNOME_DOC_INIT([0.17.2],[:],[:]) + GNOME_DEBUG_CHECK + GNOME_COMPILE_WARNINGS([maximum]) + GNOME_CXX_WARNINGS([yes]) +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,5 @@ + SUBDIRS = \ + data \ +- help \ + libgnac \ + man \ + po \ diff --git a/srcpkgs/gnac/patches/no-po-check.patch b/srcpkgs/gnac/patches/no-po-check.patch new file mode 100644 index 00000000000..bf1ddb4a9e7 --- /dev/null +++ b/srcpkgs/gnac/patches/no-po-check.patch @@ -0,0 +1,7 @@ +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,3 +1,4 @@ + # List of source files that should NOT be translated. + # Please keep this file sorted alphabetically. + data/gnac.desktop.in ++intl/plural.c diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template index ad01a1e97f9..9fea6a370e8 100644 --- a/srcpkgs/gnac/template +++ b/srcpkgs/gnac/template @@ -1,15 +1,15 @@ # Template file for 'gnac' pkgname=gnac version=0.2.4.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-scrollkeeper --disable-schemas-compile" hostmakedepends="gnome-common gettext-devel pkg-config intltool libtool - gnome-doc-utils glib-devel gtk+3-devel gst-plugins-base1-devel + glib-devel gtk+3-devel gst-plugins-base1-devel autoconf-archive which" makedepends="libxml2-devel gtk+3-devel gst-plugins-base1-devel libunique-devel libnotify-devel gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 - desktop-file-utils hicolor-icon-theme gnome-doc-utils" + desktop-file-utils hicolor-icon-theme" depends="gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 desktop-file-utils hicolor-icon-theme" short_desc="Audio conversion program for the Gnome desktop"