aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-04-24 06:32:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-04-24 06:35:24 +0000
commitce222ee7a79da33310b00d82334a4be56f9e96f5 (patch)
tree37ac1a31913972af647032161c11ddae17d69a01
parenta8c5d9f672c19b2664a1567842ef741ac069070b (diff)
downloadaports-ce222ee7a79da33310b00d82334a4be56f9e96f5.tar.bz2
aports-ce222ee7a79da33310b00d82334a4be56f9e96f5.tar.xz
main/orbit2: fix build against glib-2.36
-rw-r--r--main/orbit2/APKBUILD12
-rw-r--r--main/orbit2/glib-2.36.patch15
2 files changed, 24 insertions, 3 deletions
diff --git a/main/orbit2/APKBUILD b/main/orbit2/APKBUILD
index 08b22f401b..4387f4c12a 100644
--- a/main/orbit2/APKBUILD
+++ b/main/orbit2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=orbit2
pkgver=2.14.19
-pkgrel=2
+pkgrel=3
pkgdesc="CORBA implementation for GNOME"
url="http://projects.gnome.org/ORBit2"
arch="all"
@@ -12,7 +12,8 @@ depends_dev="glib-dev libidl-dev"
makedepends="$depends_dev"
install=""
subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/${pkgver%.*}/ORBit2-${pkgver}.tar.bz2"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/${pkgver%.*}/ORBit2-${pkgver}.tar.bz2
+ glib-2.36.patch"
_builddir="${srcdir}/ORBit2-${pkgver}"
prepare() {
@@ -38,4 +39,9 @@ package() {
"$pkgdir"/usr/lib/orbit*/*.la
}
-md5sums="7082d317a9573ab338302243082d10d1 ORBit2-2.14.19.tar.bz2"
+md5sums="7082d317a9573ab338302243082d10d1 ORBit2-2.14.19.tar.bz2
+811d99415310bd2afc46c820d5558f63 glib-2.36.patch"
+sha256sums="55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 ORBit2-2.14.19.tar.bz2
+0eba7131ced5876f9a7b68f3de1ef09898e20483809c4f677c589b7d1cc6e885 glib-2.36.patch"
+sha512sums="313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e ORBit2-2.14.19.tar.bz2
+b90d8e200d16b735bece54454d1e2b1a7c1b75aaac83986263b5a9ac38c4235eed747408a07a266c0aaaeb9c7a75e7fda1ef1b2ed54300003da38ff2251fdcfa glib-2.36.patch"
diff --git a/main/orbit2/glib-2.36.patch b/main/orbit2/glib-2.36.patch
new file mode 100644
index 0000000000..c94f920f7d
--- /dev/null
+++ b/main/orbit2/glib-2.36.patch
@@ -0,0 +1,15 @@
+$NetBSD: patch-linc2_src_Makefile.in,v 1.1 2013/04/19 14:28:54 prlw1 Exp $
+
+Avoid compilation error caused by use of deprecated g_thread API
+
+--- ./linc2/src/Makefile.in.orig 2010-09-28 09:39:39.000000000 +0000
++++ ./linc2/src/Makefile.in
+@@ -244,7 +244,7 @@ noinst_LTLIBRARIES = liblinc.la
+ # -I$(top_srcdir)/include
+ INCLUDES = -I$(top_builddir)/linc2/include \
+ -I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \
+- -DG_DISABLE_DEPRECATED $(am__append_1)
++ $(am__append_1)
+ liblinc_la_SOURCES = \
+ linc.c \
+ linc-connection.c \