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

diff --git a/fpcsrc/packages/fpmake_add.inc b/fpcsrc/packages/fpmake_add.inc
index 69f418222482cc13c83fcecfee9865f636e980cc..8e57a3b7d4030ac66f39af5473c91700a06bb18a 100644 (file)
--- 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 d1f8cc806bb814c2e24a1b05e6390f32189b0cdf..20297c46b82b886496bf6028f4d02b97055a144f 100644 (file)
--- 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 7258debf2b0ca4e6a6ce3ccf08bdb53f737f998c..0876ae73c105eb7f43c6dc884799ec9d35fefea0 100644 (file)
--- 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 74824b54f29b3d82d2c085dd064c497376eb3c00..c4f041e22d353b34a8e30ee6064e5b4aa638372a 100644 (file)
--- 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}