[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r10779: gnustep reorganized git origins, renamed
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r10779: gnustep reorganized git origins, renamed |
|
Date: |
Fri, 8 Nov 2024 21:58:10 -0500 (EST) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 10779
revision-id: carlhansen@gnu.org-20241109025801-4bxsnmcggu6gossm
parent: carlhansen@gnu.org-20241109010658-du36l0uof2lyoy3e
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Sat 2024-11-09 02:58:01 +0000
message:
gnustep reorganized git origins, renamed
renamed:
pkg/gnustep/gnustep-back/ => pkg/gnustep/libs-back/
gnustepback-20160618050220-s8fssrfqiduiyivr-1
pkg/gnustep/gnustep-base/ => pkg/gnustep/libs-base/
gnustepbase-20160617021536-2y71qvmiwaimvy1u-33
pkg/gnustep/gnustep-gui/ => pkg/gnustep/libs-gui/
gnustepgui-20160617021536-2y71qvmiwaimvy1u-36
pkg/gnustep/gnustep-make/ => pkg/gnustep/tools-make/
gnustepmake-20160617021536-2y71qvmiwaimvy1u-37
modified:
pkg/gnustep/gnumail/config.mk config.mk-20160617021724-waptzg6ikmwt929f-1
pkg/gnustep/libs-back/Makefile makefile-20160618050220-s8fssrfqiduiyivr-3
pkg/gnustep/libs-back/config.mk config.mk-20160618050220-s8fssrfqiduiyivr-2
pkg/gnustep/libs-base/Makefile makefile-20160617021536-2y71qvmiwaimvy1u-206
pkg/gnustep/libs-base/config.mk config.mk-20160617021731-lnndw4blqmfl7j8q-1
pkg/gnustep/libs-gui/Makefile makefile-20160617021536-2y71qvmiwaimvy1u-221
pkg/gnustep/libs-gui/config.mk config.mk-20160617021742-vh59cs5wvnq2eo6f-1
pkg/gnustep/libs-renaissance/Makefile
makefile-20231129032658-lwk12z6aj27dtxk7-3
pkg/gnustep/pantomime/Makefile makefile-20160617021536-2y71qvmiwaimvy1u-256
pkg/gnustep/tools-make/Makefile makefile-20160617021536-2y71qvmiwaimvy1u-226
pkg/gnustep/tools-make/config.mk config.mk-20160617021746-hdk4xwi3gp92ydq3-1
=== modified file 'pkg/gnustep/gnumail/config.mk'
--- a/pkg/gnustep/gnumail/config.mk 2017-08-29 05:53:39 +0000
+++ b/pkg/gnustep/gnumail/config.mk 2024-11-09 02:58:01 +0000
@@ -1,9 +1,9 @@
## Configuration options ##
-#CONFIGURE_OPTS ?=
+CONFIGURE_OPTS ?=
# might be needed:
-CONFIGURE_OPTS ?= --with-libiconv
+#CONFIGURE_OPTS ?= --with-libiconv
-#BUILD_OPTS ?=
+BUILD_OPTS ?=
# might be needed:
-BUILD_OPTS ?= -Wl,"-L/opt/gsrc/lib -liconv"
+#BUILD_OPTS ?= -Wl,"-L/opt/gsrc/lib -liconv"
=== renamed directory 'pkg/gnustep/gnustep-back' => 'pkg/gnustep/libs-back'
=== modified file 'pkg/gnustep/libs-back/Makefile'
--- a/pkg/gnustep/gnustep-back/Makefile 2023-11-28 07:14:44 +0000
+++ b/pkg/gnustep/libs-back/Makefile 2024-11-09 02:58:01 +0000
@@ -1,5 +1,5 @@
# Copyright ©2013, 2017 Brandon Invergo <brandon@invergo.net>
-# Copyright ©2017, 2018, 2019, 2020, 2021 Carl Hansen <carlhansen@gnu.org>
+# Copyright ©2017-2021,2024 Carl Hansen <carlhansen@gnu.org>
#
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -23,11 +23,11 @@
#
# To use GNUstep software first install these four packages in this order:
# gnustep-make gnustep-base gnustep-gui gnustep-back
-#
-
-NAME = GNUstep Back
-GARNAME = gnustep-back
-GARVERSION = 0.30.0
+
+
+NAME = GNUstep libs-back
+GARNAME = libs-back
+GARVERSION = master
HOME_URL = http://www.gnustep.org/
DESCRIPTION = GNUstep generic graphical backend
define BLURB
@@ -38,17 +38,16 @@
MASTER_SITES = $(MASTER_GITHUB)
MASTER_SUBDIR = gnustep
-# note: "libs-back" on github
GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)/libs-back.git
GIT_REVISION = master
-WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+GITSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
WORKOBJ = $(WORKSRC)
SIGFILES =
-BUILDDEPS = gnustep-make gnustep-base gnustep-gui cairo
+BUILDDEPS = tools-make libs-base libs-gui cairo
LIBDEPS =
######################################################################
@@ -59,6 +58,10 @@
fetch: fetch-git
+pre-extract: fetch
+ mkdir -p $(WORKSRC)
+ cp -a $(GITSRC)/* $(WORKSRC)
+
post-install:
make -C $(WORKOBJ)/Documentation/ install
=== modified file 'pkg/gnustep/libs-back/config.mk'
--- a/pkg/gnustep/gnustep-back/config.mk 2020-10-08 22:53:22 +0000
+++ b/pkg/gnustep/libs-back/config.mk 2024-11-09 02:58:01 +0000
@@ -1,4 +1,4 @@
-## Configuration options for gnustep-back ##
+## Configuration options for gnustep libs-back ##
CONFIGURE_OPTS ?=
BUILD_OPTS ?=
=== renamed directory 'pkg/gnustep/gnustep-base' => 'pkg/gnustep/libs-base'
=== modified file 'pkg/gnustep/libs-base/Makefile'
--- a/pkg/gnustep/gnustep-base/Makefile 2023-11-28 07:14:44 +0000
+++ b/pkg/gnustep/libs-base/Makefile 2024-11-09 02:58:01 +0000
@@ -1,5 +1,5 @@
# Copyright ©2013, 2014, 2017 Brandon Invergo <brandon@invergo.net>
-# Copyright ©2017, 2019, 2020, 2023 Carl Hansen <carlhansen@gnu.org>
+# Copyright ©2017, 2019, 2020, 2023-2024 Carl Hansen <carlhansen@gnu.org>
#
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -26,16 +26,16 @@
# gnustep-make gnustep-base gnustep-gui gnustep-back
-NAME = GNUstep Base
-GARNAME = gnustep-base
-GARVERSION = 1.29.0
+NAME = GNUstep libs-base
+GARNAME = libs-base
+GARVERSION = master
HOME_URL = http://www.gnustep.org/
DESCRIPTION = GNUstep base foundation library
define BLURB
endef
-# Other external libraries that you may need to install include:
+# Other external libraries that you might need to install include:
#
# * ffi (HIGHLY RECOMMENDED)
# * icu (HIGHLY RECOMMENDED)
@@ -57,18 +57,13 @@
GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)/libs-base.git
GIT_REVISION = master
-WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
-WORKOBJ = $(WORKSRC)
+GITSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+WORKSRC = $(WORKDIR)/$(DISTNAME)
+WORKOBJ = $(WORKSRC)-build
SIGFILES =
-#CONFIGURE_SCRIPTS =
-#BUILD_SCRIPTS = my
-#INSTALL_SCRIPTS = my
-
-#USE_AUTORECONF = y
-
-BUILDDEPS = gnustep-make libffi gnutls libxml2
+BUILDDEPS = tools-make libffi gnutls libxml2
LIBDEPS =
######################################################################
@@ -81,13 +76,17 @@
fetch: fetch-git
+pre-extract: fetch
+ mkdir -p $(WORKSRC)
+ mkdir -p $(WORKOBJ)
+ cp -a $(GITSRC)/* $(WORKSRC)
+
+post-install:
+ make -C $(WORKOBJ)/Documentation/ install
+ $(MAKECOOKIE)
+
check: build
cd $(WORKOBJ) && $(MAKE) check
# or make -C $(WORKOBJ) check
-post-install:
- make -C $(WORKOBJ)/Documentation/ install
- $(MAKECOOKIE)
-
-
=== modified file 'pkg/gnustep/libs-base/config.mk'
--- a/pkg/gnustep/gnustep-base/config.mk 2023-11-28 07:14:44 +0000
+++ b/pkg/gnustep/libs-base/config.mk 2024-11-09 02:58:01 +0000
@@ -1,4 +1,4 @@
-## Configuration options for gnustep-base ##
+## Configuration options for gnustep libs-base ##
CONFIGURE_OPTS ?=
BUILD_OPTS ?=
=== renamed directory 'pkg/gnustep/gnustep-gui' => 'pkg/gnustep/libs-gui'
=== modified file 'pkg/gnustep/libs-gui/Makefile'
--- a/pkg/gnustep/gnustep-gui/Makefile 2023-11-28 07:14:44 +0000
+++ b/pkg/gnustep/libs-gui/Makefile 2024-11-09 02:58:01 +0000
@@ -1,5 +1,5 @@
# Copyright © 2013, 2017 Brandon Invergo <brandon@invergo.net>
-# Copyright © 2017, 2018, 2019, 2020, 2021, 2023 Carl Hansen
<carlhansen@gnu.org>
+# Copyright © 2017, 2018, 2019, 2020, 2021, 2023-2024 Carl Hansen
<carlhansen@gnu.org>
#
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -24,19 +24,18 @@
# To use GNUstep, install these packages in this order:
# gnustep-make gnustep-base gnustep-gui gnustep-back
-NAME = GNUstep GUI
-GARNAME = gnustep-gui
-GARVERSION = 0.30.0
+NAME = GNUstep libs-gui
+GARNAME = libs-gui
+GARVERSION = master
HOME_URL = http://www.gnustep.org/
DESCRIPTION = GNUstep graphical user interface class library
define BLURB
endef
-
-# You must have installed gnustep-base and gnustep-make before building
+# You must have installed tools-make and libs-base before building
# this library. GNUstep Make version 2.0.0 or greater is required.
-# GNUstep Base version 1.15.0 or greater is required.
+# GNUstep libs-base version 1.15.0 or greater is required.
#
# Other external libraries that you should have installed include:
#
@@ -58,16 +57,15 @@
MASTER_SITES = $(MASTER_GITHUB)
MASTER_SUBDIR = gnustep
-# note: "libs-gui" on github
GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)/libs-gui.git
GIT_REVISION = master
-WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+GITSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
WORKOBJ = $(WORKSRC)
SIGFILES =
-BUILDDEPS = gnustep-make gnustep-base libtiff
+BUILDDEPS = tools-make libs-base libtiff
LIBDEPS =
# apt install libjpeg-dev libtiff-dev libpng
######################################################################
@@ -77,12 +75,16 @@
fetch: fetch-git
+pre-extract: fetch
+ mkdir -p $(WORKSRC)
+ cp -a $(GITSRC)/* $(WORKSRC)
+
+post-install:
+ make -C $(WORKOBJ)/Documentation/ install
+ $(MAKECOOKIE)
+
+
check: build
cd $(WORKOBJ) && $(MAKE) check
-post-install:
- make -C $(WORKOBJ)/Documentation/ install
- $(MAKECOOKIE)
-
-
=== modified file 'pkg/gnustep/libs-gui/config.mk'
--- a/pkg/gnustep/gnustep-gui/config.mk 2016-06-17 19:08:15 +0000
+++ b/pkg/gnustep/libs-gui/config.mk 2024-11-09 02:58:01 +0000
@@ -1,4 +1,4 @@
-## Configuration options for gnustep-gui ##
+## Configuration options for gnustep libs-gui ##
CONFIGURE_OPTS ?=
BUILD_OPTS ?=
=== modified file 'pkg/gnustep/libs-renaissance/Makefile'
--- a/pkg/gnustep/libs-renaissance/Makefile 2023-11-29 03:27:12 +0000
+++ b/pkg/gnustep/libs-renaissance/Makefile 2024-11-09 02:58:01 +0000
@@ -40,12 +40,12 @@
GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)/libs-renaissance.git
GIT_REVISION = master
-WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+GITSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
WORKOBJ = $(WORKSRC)
SIGFILES =
-BUILDDEPS = gnustep-make gnustep-base gnustep-gui
+BUILDDEPS = tools-make libs-base libs-gui libs-back
LIBDEPS =
CONFIGURE_SCRIPTS =
######################################################################
@@ -57,6 +57,10 @@
fetch: fetch-git
+pre-extract: fetch
+ mkdir -p $(WORKSRC)
+ cp -a $(GITSRC)/* $(WORKSRC)/
+
post-install:
make -C $(WORKOBJ)/Documentation/ install
=== modified file 'pkg/gnustep/pantomime/Makefile'
--- a/pkg/gnustep/pantomime/Makefile 2023-02-15 04:39:46 +0000
+++ b/pkg/gnustep/pantomime/Makefile 2024-11-09 02:58:01 +0000
@@ -23,7 +23,7 @@
GARNAME = pantomime
UPSTREAMNAME = Pantomime
GARVERSION = 1.4.0
-HOME_URL = http://www.collaboration-world.com/cgi-bin/project/index.cgi?pid=3/
+HOME_URL = http://www.collaboration-world.com/cgi-bin/project/index.cgi?pid=3
DESCRIPTION = An e-mail framework
define BLURB
Pantomime provides an e-mail framework, primarily for the GNUstep
@@ -43,10 +43,11 @@
SIGFILES =
CONFIGURE_SCRIPTS =
-BUILDDEPS = gnustep-base
+BUILDDEPS = tools-make libs-base
LIBDEPS =
######################################################################
include ../../../gar/gar.lib/gnustep.mk
include config.mk
+
=== renamed directory 'pkg/gnustep/gnustep-make' => 'pkg/gnustep/tools-make'
=== modified file 'pkg/gnustep/tools-make/Makefile'
--- a/pkg/gnustep/gnustep-make/Makefile 2023-11-28 07:14:44 +0000
+++ b/pkg/gnustep/tools-make/Makefile 2024-11-09 02:58:01 +0000
@@ -1,5 +1,5 @@
# Copyright © 2013, 2017 Brandon Invergo <brandon@invergo.net>
-# Copyright © 2020, 2021, 2023 Carl Hansen <carlhansen@gnu.org>
+# Copyright © 2020, 2021, 2023-2024 Carl Hansen <carlhansen@gnu.org>
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -24,44 +24,50 @@
# gnustep-make gnustep-base gnustep-gui gnustep-back
-NAME = GNUstep-Make
-GARNAME = gnustep-make
-GARVERSION = 2.9.1
+NAME = GNUstep-tools-make
+#GARNAME = gnustep-make
+GARNAME = tools-make
+GARVERSION = master
HOME_URL = http://www.gnustep.org/
-DESCRIPTION = global GNUstep Makefile package
+DESCRIPTION = global GNUstep Makefile package tools-make
define BLURB
endef
######################################################################
# https://github.com/gnustep/tools-make.git
-#
https://github.com/gnustep/tools-make/releases/download/make-2_9_1/gnustep-make-2.9.1.tar.gz
MASTER_SITES = $(MASTER_GITHUB)
MASTER_SUBDIR = gnustep
GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)/tools-make.git
GIT_REVISION = master
-WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+
+SIGFILES =
+
+GITSRC = $(DOWNLOADDIRGIT)/
+WORKSRC = $(WORKDIR)/$(DISTNAME)
WORKOBJ = $(WORKDIR)/$(DISTNAME)-build
-SIGFILES =
-
-#CONFIGURE_SCRIPTS =
-#BUILD_SCRIPTS = my
-#INSTALL_SCRIPTS = my
-
-#USE_AUTORECONF = y
-
BUILDDEPS =
LIBDEPS =
+# USE_AUTORECONF = yes
######################################################################
include ../../../gar/gar.lib/autotools.mk
include config.mk
+
fetch: fetch-git
+pre-extract: fetch
+ mkdir -p $(WORKSRC)
+ mkdir -p $(WORKOBJ)
+ cp -a $(GITSRC)/$(GARNAME)/* $(WORKSRC)/
+
post-install:
make -C $(WORKSRC)/Documentation/ install
+# .dot dirs? what to do?
+# make dist-clean ?
+
=== modified file 'pkg/gnustep/tools-make/config.mk'
--- a/pkg/gnustep/gnustep-make/config.mk 2023-11-28 07:14:44 +0000
+++ b/pkg/gnustep/tools-make/config.mk 2024-11-09 02:58:01 +0000
@@ -1,8 +1,9 @@
-## Configuration options for gnustep-make ##
+## Configuration options for gnustep tools-make ##
-CONFIGURE_OPTS ?= --enable-native-objc-exceptions \
- --with-library-combo=gnu-gnu-gnu \
- --with-layout=fhs
+CONFIGURE_OPTS ?=
+#--enable-native-objc-exceptions \
+#--with-library-combo=gnu-gnu-gnu \
+#--with-layout=fhs
# you have layout options, see gnustep docs
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r10779: gnustep reorganized git origins, renamed,
Carl Hansen <=