From 9b63235ba1e173ad942f52d1f22149e369cf9367 Mon Sep 17 00:00:00 2001 From: Paul Gevers Date: Sun, 24 Dec 2023 10:36:38 +0000 Subject: [PATCH] Disable the gnome1, gtk1, fpgtk and imlib packages to build as they depend on libraries long go removed from Debian. Gbp-Pq: Name disable_building_gnome1_and_gtk1.patch --- fpcsrc/packages/fpmake_add.inc | 4 ---- fpcsrc/packages/fpmake_proc.inc | 24 ------------------------ fpcsrc/utils/fpmake_add.inc | 1 - fpcsrc/utils/fpmake_proc.inc | 2 -- 4 files changed, 31 deletions(-) diff --git a/fpcsrc/packages/fpmake_add.inc b/fpcsrc/packages/fpmake_add.inc index 69f41822..8e57a3b7 100644 --- a/fpcsrc/packages/fpmake_add.inc +++ b/fpcsrc/packages/fpmake_add.inc @@ -33,7 +33,6 @@ add_fcl_web(ADirectory+IncludeTrailingPathDelimiter('fcl-web')); add_fcl_xml(ADirectory+IncludeTrailingPathDelimiter('fcl-xml')); add_fftw(ADirectory+IncludeTrailingPathDelimiter('fftw')); - add_fpgtk(ADirectory+IncludeTrailingPathDelimiter('fpgtk')); add_fpindexer(ADirectory+IncludeTrailingPathDelimiter('fpindexer')); add_fpmkunit(ADirectory+IncludeTrailingPathDelimiter('fpmkunit')); add_fppkg(ADirectory+IncludeTrailingPathDelimiter('fppkg')); @@ -42,9 +41,7 @@ add_gdbm(ADirectory+IncludeTrailingPathDelimiter('gdbm')); add_ggi(ADirectory+IncludeTrailingPathDelimiter('ggi')); add_gmp(ADirectory+IncludeTrailingPathDelimiter('gmp')); - add_gnome1(ADirectory+IncludeTrailingPathDelimiter('gnome1')); add_graph(ADirectory+IncludeTrailingPathDelimiter('graph')); - add_gtk1(ADirectory+IncludeTrailingPathDelimiter('gtk1')); add_gtk2(ADirectory+IncludeTrailingPathDelimiter('gtk2')); add_hash(ADirectory+IncludeTrailingPathDelimiter('hash')); add_hermes(ADirectory+IncludeTrailingPathDelimiter('hermes')); @@ -55,7 +52,6 @@ add_ibase(ADirectory+IncludeTrailingPathDelimiter('ibase')); add_iconvenc(ADirectory+IncludeTrailingPathDelimiter('iconvenc')); add_imagemagick(ADirectory+IncludeTrailingPathDelimiter('imagemagick')); - add_imlib(ADirectory+IncludeTrailingPathDelimiter('imlib')); add_iosxlocale(ADirectory+IncludeTrailingPathDelimiter('iosxlocale')); add_jni(ADirectory+IncludeTrailingPathDelimiter('jni')); add_ldap(ADirectory+IncludeTrailingPathDelimiter('ldap')); diff --git a/fpcsrc/packages/fpmake_proc.inc b/fpcsrc/packages/fpmake_proc.inc index d1f8cc80..20297c46 100644 --- a/fpcsrc/packages/fpmake_proc.inc +++ b/fpcsrc/packages/fpmake_proc.inc @@ -196,12 +196,6 @@ begin {$include fftw/fpmake.pp} end; -procedure add_fpgtk(const ADirectory: string); -begin - with Installer do -{$include fpgtk/fpmake.pp} -end; - {$include fpindexer/fpmake.pp} procedure add_fpmkunit(const ADirectory: string); @@ -238,24 +232,12 @@ begin {$include gmp/fpmake.pp} end; -procedure add_gnome1(const ADirectory: string); -begin - with Installer do -{$include gnome1/fpmake.pp} -end; - procedure add_graph(const ADirectory: string); begin with Installer do {$include graph/fpmake.pp} end; -procedure add_gtk1(const ADirectory: string); -begin - with Installer do -{$include gtk1/fpmake.pp} -end; - procedure add_gtk2(const ADirectory: string); begin with Installer do @@ -316,12 +298,6 @@ begin {$include imagemagick/fpmake.pp} end; -procedure add_imlib(const ADirectory: string); -begin - with Installer do -{$include imlib/fpmake.pp} -end; - procedure add_iosxlocale(const ADirectory: string); begin with Installer do diff --git a/fpcsrc/utils/fpmake_add.inc b/fpcsrc/utils/fpmake_add.inc index 7258debf..0876ae73 100644 --- a/fpcsrc/utils/fpmake_add.inc +++ b/fpcsrc/utils/fpmake_add.inc @@ -4,7 +4,6 @@ add_fpcres(ADirectory+IncludeTrailingPathDelimiter('fpcres')); add_fpcreslipo(ADirectory+IncludeTrailingPathDelimiter('fpcreslipo')); add_fpdoc(ADirectory+IncludeTrailingPathDelimiter('fpdoc')); - add_fpmc(ADirectory+IncludeTrailingPathDelimiter('fpmc')); add_fppkg_util(ADirectory+IncludeTrailingPathDelimiter('fppkg')); add_fprcp(ADirectory+IncludeTrailingPathDelimiter('fprcp')); add_h2pas(ADirectory+IncludeTrailingPathDelimiter('h2pas')); diff --git a/fpcsrc/utils/fpmake_proc.inc b/fpcsrc/utils/fpmake_proc.inc index 74824b54..c4f041e2 100644 --- a/fpcsrc/utils/fpmake_proc.inc +++ b/fpcsrc/utils/fpmake_proc.inc @@ -10,8 +10,6 @@ {$include fpdoc/fpmake.pp} -{$include fpmc/fpmake.pp} - {$include fppkg/fpmake.pp} {$include fprcp/fpmake.pp} -- 2.30.2