[Gsrc-commit] trunk r5876: some stuff gdk etc:

[Carl Hansen]

------------------------------------------------------------
revno: 5876
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sat 2018-09-01 01:39:25 -0700
message:
  some stuff gdk etc:
modified:
  gar/gar.master.mk              gar.master.mk-20160617013745-b969jpkm3t4wwhf2-1
  pkg/gnome/gdk-pixbuf/Makefile  makefile-20160617013746-7ygosxqw3lxxvo7f-483
  pkg/gnu/xlogmaster/Makefile    makefile-20160617014725-uokjfnggs70iry9h-2023
  pkg/gnu/xlogmaster/config.mk   config.mk-20160617021515-jm4d4qb9kkqj9610-1
  pkg/gnustep/gemas/Makefile     makefile-20170801034435-d5acv3mt74o8ujh2-3

=== modified file 'gar/gar.master.mk'
--- a/gar/gar.master.mk 2018-03-25 08:09:25 +0000
+++ b/gar/gar.master.mk 2018-09-01 08:39:25 +0000
@@ -54,8 +54,10 @@
        http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/
 MASTER_GNUSTEP ?= \
        http://ftpmain.gnustep.org/pub/gnustep/
+MASTER_GNUSTEP_GAP ?= \
+    http://download.savannah.nongnu.org/releases/gap/
 MASTER_GNUSTEP_NONFSF ?= \
-    http://download.savannah.nongnu.org/releases/gap/
+    http://download.savannah.nongnu.org/releases/gnustep-nonfsf/
 # gna defunct  http://download.gna.org/gnustep-nonfsf/
 #
 MASTER_GNUTLS ?= \

=== modified file 'pkg/gnome/gdk-pixbuf/Makefile'
--- a/pkg/gnome/gdk-pixbuf/Makefile     2018-08-31 07:50:23 +0000
+++ b/pkg/gnome/gdk-pixbuf/Makefile     2018-09-01 08:39:25 +0000
@@ -50,9 +50,25 @@
 include ../../../gar/gar.lib/mesonninja.mk
 include config.mk
 # 
-#
-# missing file, this is a kludge that lets the rest work:
+#  
+# need to mess with GDK_PIXBUF_MODULEDIR because wrong path is built in  
+#  
+# pointless 
+pre-configure:
+       export 
GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
+       $(MAKECOOKIE)
+
+# missing file, resources.c this is a kludge that lets the rest work:
 pre-build:
        touch $(WORKOBJ)/tests/resources.c
+       $(MAKECOOKIE)
+
+#GDK_PIXBUF_MODULEDIR=/opt/gsrc/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
+#export  GDK_PIXBUF_MODULEDIR
+
+custom-post-install:
+       echo updating  
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+       env 
GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
 gdk-pixbuf-query-loaders >  
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+       $(MAKECOOKIE)
 
 

=== modified file 'pkg/gnu/xlogmaster/Makefile'
--- a/pkg/gnu/xlogmaster/Makefile       2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/xlogmaster/Makefile       2018-09-01 08:39:25 +0000
@@ -40,5 +40,6 @@
 
 ######################################################################
 
+CPATH=$(prefix)/include/glib-2.0/
 include ../../../gar/gar.lib/auto.mk
 include config.mk

=== modified file 'pkg/gnu/xlogmaster/config.mk'
--- a/pkg/gnu/xlogmaster/config.mk      2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/xlogmaster/config.mk      2018-09-01 08:39:25 +0000
@@ -1,4 +1,4 @@
 ## Configuration options for xlogmaster ##
 
-CONFIGURE_OPTS ?= 
-BUILD_OPTS ?=
+CONFIGURE_OPTS ?=  --disable-gtktest  
+BUILD_OPTS ?=  -I$(prefix)/include/pango-1.0/

=== modified file 'pkg/gnustep/gemas/Makefile'
--- a/pkg/gnustep/gemas/Makefile        2018-09-01 02:17:45 +0000
+++ b/pkg/gnustep/gemas/Makefile        2018-09-01 08:39:25 +0000
@@ -28,8 +28,8 @@
 
 ######################################################################
 
-MASTER_SITES = $(MASTER_GNUSTEP_NONFSF)/
-MASTER_SUBDIR = /
+MASTER_SITES = $(MASTER_SAVANNAH_RELEASES)/
+MASTER_SUBDIR = gnustep-nonfsf/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES  = $(DISTNAME).tar.gz.sig