Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9976 from neheb/gee

Browse source 
libgee: Update to 0.20.2
This commit is contained in:
Rosen Penev 2019-09-12 14:07:22 -07:00 committed by GitHub
commit 2ea41f32ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libs/libgee/Makefile
View file

@ -6,21 +6,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgee
PKG_VERSION:=0.20.1
PKG_RELEASE:=2
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING
PKG_VERSION:=0.20.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/libgee/0.20/
PKG_HASH:=bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630
PKG_SOURCE_URL:=@GNOME/libgee/0.20
PKG_HASH:=9e035c4b755f46bfae70ba81cdcf8328b03f554373cec8c816e8b5680f85353c
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=vala/host
include $(INCLUDE_DIR)/package.mk
@ -39,7 +37,12 @@ define Package/libgee/decription
endef
CONFIGURE_ARGS += \
--disable-doc
--disable-benchmark \
--disable-coverage \
--disable-doc \
--disable-internal-asserts \
--disable-introspection \
--disable-vala-fatal-warnings
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/

102
libs/libgee/patches/libgee-0.18.0-no-introspection.patch
View file

@ -1,102 +0,0 @@
diff -u --recursive libgee-0.20.0-vanilla/configure.ac libgee-0.20.0/configure.ac
--- libgee-0.20.0-vanilla/configure.ac 2018-01-07 20:42:52.827537620 -0500
+++ libgee-0.20.0/configure.ac 2018-01-07 20:43:25.128645499 -0500
@@ -65,11 +65,6 @@
enable_consistency_check=$enableval, enable_consistency_check=no)
AS_IF([test "x$enable_consistency_check" != xno], [VALA_ADD_VALAFLAGS(-D CONSISTENCY_CHECKS)])
-AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK])
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
-
-VALA_CHECK([0.25.1])
-
AC_OUTPUT([Makefile
gee-0.8.pc
benchmark/Makefile
diff -u --recursive libgee-0.20.0-vanilla/gee/Makefile.am libgee-0.20.0/gee/Makefile.am
--- libgee-0.20.0-vanilla/gee/Makefile.am 2018-01-07 20:42:52.829537627 -0500
+++ libgee-0.20.0/gee/Makefile.am 2018-01-07 20:43:48.332722990 -0500
@@ -146,29 +146,6 @@
gee-0.8.vapi \
$(NULL)
-if HAVE_INTROSPECTION
-girdir = @INTROSPECTION_GIRDIR@
-
-dist_gir_DATA = \
- Gee-0.8.gir \
- $(NULL)
-
-typelibdir = @INTROSPECTION_TYPELIBDIR@
-typelib_DATA = \
- Gee-0.8.typelib \
- $(NULL)
-
-# Extract dlname from libfolks.la; see bug #658002.
-# This is what g-ir-scanner does.
-libgee_dlname = \
- `$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la`
-INTROSPECTION_COMPILER_ARGS= \
- -l $(libgee_dlname)
-Gee-0.8.gir: libgee_0_8_la_vala.stamp
-Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la
- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
-endif
-
MOSTLYCLEANFILES = \
$(libgee_0_8_la_VALASOURCES:.vala=.c) \
libgee_0_8_la_vala.stamp \
diff -u --recursive libgee-0.20.0-vanilla/gee/Makefile.in libgee-0.20.0/gee/Makefile.in
--- libgee-0.20.0-vanilla/gee/Makefile.in 2018-01-07 20:42:52.830537630 -0500
+++ libgee-0.20.0/gee/Makefile.in 2018-01-07 20:44:18.433823516 -0500
@@ -297,14 +297,6 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
@@ -544,25 +536,6 @@
gee-0.8.vapi \
$(NULL)
-@HAVE_INTROSPECTION_TRUE@girdir = @INTROSPECTION_GIRDIR@
-@HAVE_INTROSPECTION_TRUE@dist_gir_DATA = \
-@HAVE_INTROSPECTION_TRUE@ Gee-0.8.gir \
-@HAVE_INTROSPECTION_TRUE@ $(NULL)
-
-@HAVE_INTROSPECTION_TRUE@typelibdir = @INTROSPECTION_TYPELIBDIR@
-@HAVE_INTROSPECTION_TRUE@typelib_DATA = \
-@HAVE_INTROSPECTION_TRUE@ Gee-0.8.typelib \
-@HAVE_INTROSPECTION_TRUE@ $(NULL)
-
-
-# Extract dlname from libfolks.la; see bug #658002.
-# This is what g-ir-scanner does.
-@HAVE_INTROSPECTION_TRUE@libgee_dlname = \
-@HAVE_INTROSPECTION_TRUE@ `$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la`
-
-@HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS = \
-@HAVE_INTROSPECTION_TRUE@ -l $(libgee_dlname)
-
MOSTLYCLEANFILES = \
$(libgee_0_8_la_VALASOURCES:.vala=.c) \
libgee_0_8_la_vala.stamp \
@@ -1621,9 +1594,6 @@
$(libgee_0_8_la_VALASOURCES:.vala=.c): libgee_0_8_la_vala.stamp
gee-0.8.vapi gee-internals-0.8.vapi gee.h gee-internals.h: libgee_0_8_la_vala.stamp
-@HAVE_INTROSPECTION_TRUE@Gee-0.8.gir: libgee_0_8_la_vala.stamp
-@HAVE_INTROSPECTION_TRUE@Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la
-@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.