[libical-glib] Apply Milan patch to fix the issue with array.py. The error was about array.append(element1) in arra
- From: Miao Yu <williamyu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libical-glib] Apply Milan patch to fix the issue with array.py. The error was about array.append(element1) in arra
- Date: Sat, 21 Mar 2015 15:09:29 +0000 (UTC)
commit 3d74a1107df031291fd8668fc62856023d0ff24e
Author: William Yu <williamyu gnome org>
Date: Sat Mar 21 11:08:39 2015 -0400
Apply Milan patch to fix the issue with array.py. The error was about array.append(element1) in array.py.
The message was ValueError: Pointer arguments are restricted to integers, capsules and None.
Makefile.am | 7 +++----
configure.ac | 3 +++
libical-glib.pc.in | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index dad425d..f754ddf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,13 +4,12 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
@GNOME_CODE_COVERAGE_RULES@
pkgconfigdir = $(libdir)/pkgconfig
-INTERFACE_VERSION=1.0
-%-$(INTERFACE_VERSION).pc: %.pc
+%-$(API_VERSION).pc: %.pc
cp $< $@
-pkgconfig_in_files = libical-glib-$(INTERFACE_VERSION).pc
-pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(INTERFACE_VERSION).pc)
+pkgconfig_in_files = libical-glib-$(API_VERSION).pc
+pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(API_VERSION).pc)
NULL =
diff --git a/configure.ac b/configure.ac
index bac0eb8..b354ab9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ m4_define([ical_minor_version], [0])
m4_define([ical_micro_version], [1])
m4_define([ical_version], [ical_major_version.ical_minor_version.ical_micro_version])
+m4_define([api_version], [1.0])
AC_PREREQ(2.58)
AC_INIT([libical-glib], [ical_version], [http://bugzilla.gnome.org/browse.cgi?product=TODO])
@@ -22,6 +23,8 @@ dnl Keep these two definitions in agreement.
m4_define([glib_minimum_version], [2.32])
m4_define([glib_encoded_version], [GLIB_VERSION_2_32])
+AC_SUBST([API_VERSION],[api_version])
+
dnl ***********************************
dnl Automake 1.11 - Silent Build Rules
dnl ***********************************
diff --git a/libical-glib.pc.in b/libical-glib.pc.in
index 7b9454f..aafc7bb 100644
--- a/libical-glib.pc.in
+++ b/libical-glib.pc.in
@@ -2,12 +2,12 @@ prefix= prefix@
exec_prefix= exec_prefix@
libdir= libdir@
includedir= includedir@
-privlibdir= privlibdir@
datarootdir= datarootdir@
datadir= datadir@
-privdatadir= privdatadir@
Name: libical-glib
Description: A GObject interface of the libical library
Version: @VERSION@
-Requires: glib-2.0, gobject-2.0
+Requires: glib-2.0, gobject-2.0, libical
+Libs: -L${libdir} -lical-glib- API_VERSION@
+Cflags: -I${includedir}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]