[Gsrc-commit] trunk r7110: gnome changes

[Carl Hansen]

------------------------------------------------------------
revno: 7110
revision-id: carl@aurora-20200717160118-uz0kvxpc9zexq3vm
parent: carl@aurora-20200717035604-g3hl6222655j1cr2
committer: carl <carl@aurora>
branch nick: trunk
timestamp: Fri 2020-07-17 09:01:18 -0700
message:
  gnome changes
removed:
  pkg/gnome/gtk4/                gtk4-20190421214022-syehdzsgnh35bb2h-1
  pkg/gnome/gtk4/Makefile        makefile-20190421214022-syehdzsgnh35bb2h-3
  pkg/gnome/gtk4/config.mk       config.mk-20190421214022-syehdzsgnh35bb2h-2
  pkg/gnome/gtk4/sha256sums      sha256sums-20190421214022-syehdzsgnh35bb2h-4
modified:
  pkg/gnome/glib/Makefile        makefile-20160617013746-7ygosxqw3lxxvo7f-552
  pkg/gnome/glib/config.mk       config.mk-20160617013948-zxz0vnfa6s7m6z8o-1

=== modified file 'pkg/gnome/glib/Makefile'
--- a/pkg/gnome/glib/Makefile   2020-07-16 13:44:59 +0000
+++ b/pkg/gnome/glib/Makefile   2020-07-17 16:01:18 +0000
@@ -50,3 +50,9 @@
 include config.mk
 
 # HINT: might need "meson configure work/glib-2.62.4.build/ -Diconv=external"
+# in meson_options.txt   
+#option('iconv',
+#       type : 'combo',
+#       choices : ['auto', 'libc', 'external'],
+#       value : 'external',
+#       description : 'iconv implementation to use (\'libc\' = \'Part of the C 
library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which 
iconv is available\')')

=== modified file 'pkg/gnome/glib/config.mk'
--- a/pkg/gnome/glib/config.mk  2020-07-14 23:36:24 +0000
+++ b/pkg/gnome/glib/config.mk  2020-07-17 16:01:18 +0000
@@ -2,12 +2,12 @@
 
 #CONFIGURE_OPTS ?= 
 # might be needed:
-#CONFIGURE_OPTS ?=  --with-libiconv  CFLAGS="-DUSE_LIBICONV_GNU=1" -Diconv=gnu
-CONFIGURE_OPTS ?= 
+CONFIGURE_OPTS ?=  --with-libiconv  CFLAGS="-DUSE_LIBICONV_GNU=1" -Diconv=gnu
+#CONFIGURE_OPTS ?= 
 
-BUILD_OPTS ?= 
+#BUILD_OPTS ?= 
 # might be needed:
-#BUILD_OPTS ?=  -Wl,-I/opt/gsrc/include -Wl,-L/opt/gsrc/lib  -Wl,-liconv  
CFLAGS="-DUSE_LIBICONV_GNU=1" LDFLAGS+=-liconv -Dicon=gnu
+BUILD_OPTS ?=  -Wl,-I/opt/gsrc/include -Wl,-L/opt/gsrc/lib -Wl,-rpath 
-Wl,/opt/gsrc/lib  CFLAGS="-DUSE_LIBICONV_GNU=1" LDFLAGS+=-liconv -Dicon=gnu
 #BUILD_OPTS ?=  -Wl,-I/opt/gsrc/include -Wl,-L/opt/gsrc/lib 
 #-Wl,-liconv  CFLAGS="-DUSE_LIBICONV_GNU=1" LDFLAGS+=-liconv
 

=== removed directory 'pkg/gnome/gtk4'
=== removed file 'pkg/gnome/gtk4/Makefile'
--- a/pkg/gnome/gtk4/Makefile   2019-04-21 21:46:47 +0000
+++ b/pkg/gnome/gtk4/Makefile   1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# Copyright © 2016, 2017, 2018, 2019 Carl Hansen <carlhansen@gnu.org>
-#
-# This file is part of GSRC, the GNU Source Release Collection.
-#
-# GSRC is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GSRC is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-# License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
-
-NAME =    GTK+
-GARNAME = gtk4
-UPSTREAMNAME = gtk+
-# to be gtk 4:
-GARVERSION = 3.94.0
-HOME_URL = http://www.gnome.org/
-DESCRIPTION =  gtk+ 4  GNOME 3 toolkit
-define BLURB
-endef
-
-######################################################################
-
-empty:=
-space:= $(empty) $(empty)
-VERSION_LIST = $(subst .,$(space),$(GARVERSION))
-SERIES = $(subst $(space),.,$(wordlist 1,2,$(VERSION_LIST)))
-
-MASTER_SITES = $(MASTER_GNOME)
-MASTER_SUBDIR = $(UPSTREAMNAME)/$(SERIES)/
-DISTFILES = $(DISTNAME).tar.xz  $(DISTNAME).sha256sum
-SIGFILES =
-
-BUILDDEPS =
-# apt install libepoxy-dev libmount-dev libxcb-xkb-dev
-# libselinux-dev libsystemd-dev  libepoxy0 xorg-dev  gdk-pixbuf
-#  libsqlite3-dev libatk-bridge2.0-0 libatk-bridge2.0-dev
-LIBDEPS =
-
-######################################################################
-
-#include ../../../gar/gar.lib/auto.mk
-include ../../../gar/gar.lib/mesonninja.mk
-include config.mk
-

=== removed file 'pkg/gnome/gtk4/config.mk'
--- a/pkg/gnome/gtk4/config.mk  2019-04-21 21:46:47 +0000
+++ b/pkg/gnome/gtk4/config.mk  1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-## Configuration options 
-## adjust as needed for your local system
-
-CONFIGURE_OPTS ?=
-BUILD_OPTS ?= 
-
-

=== removed file 'pkg/gnome/gtk4/sha256sums'
--- a/pkg/gnome/gtk4/sha256sums 2019-04-21 21:46:47 +0000
+++ b/pkg/gnome/gtk4/sha256sums 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-a947caa5296610b0f1d7a03b58df34765c227c577c78e683e75eea3251a67035  
download/gtk+-3.94.0.tar.xz
-1ff7b3f4926efd5d1c041080d897be93f7bd1eae00ad5211aa0f2d0026ed5d1b  
download/gtk+-3.94.0.sha256sum