Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 91 insertions, 0 deletions

diff --git a/package/libqmi/Makefile b/package/libqmi/Makefile
new file mode 100644
index 000000000..8f041d2ae
--- /dev/null
+++ b/package/libqmi/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		libqmi
+PKG_VERSION:=		1.12.4
+PKG_RELEASE:=		1
+PKG_HASH:=		5527342bc869400d2a9c3038d66ec8ef87980aefb6c7aae593a13ebfee686a15
+PKG_DESCR:=		qmi modem protocol helper library
+PKG_SECTION:=		libs/net
+PKG_DEPENDS:=		glib
+PKG_BUILDDEP:=		glib
+PKG_URL:=		http://cgit.freedesktop.org/libqmi/
+PKG_SITES:=		http://cgit.freedesktop.org/libqmi/snapshot/
+PKG_OPTS:=		dev
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBQMI,libqmi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+AUTOTOOL_STYLE:=	autogen
+
+libqmi-install:
+	$(INSTALL_DIR) $(IDIR_LIBQMI)/usr/{bin,lib}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/qmi{-network,cli} \
+		$(IDIR_LIBQMI)/usr/bin
+	$(CP) $(WRKINST)/usr/lib/libqmi-glib.so* $(IDIR_LIBQMI)/usr/lib/
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libqmi/patches/patch-Makefile_am b/package/libqmi/patches/patch-Makefile_am
new file mode 100644
index 000000000..e064743aa
--- /dev/null
+++ b/package/libqmi/patches/patch-Makefile_am
@@ -0,0 +1,13 @@
+	do not enable gtk-doc
+--- libqmi-1.12.4.orig/Makefile.am	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/Makefile.am	2015-02-20 18:20:29.213191733 +0100
+@@ -4,8 +4,7 @@ SUBDIRS = . data build-aux src utils doc
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+-	--with-udev-base-dir="$$dc_install_base" \
+-	--enable-gtk-doc
++	--with-udev-base-dir="$$dc_install_base"
+ 
+ EXTRA_DIST = \
+ 	gtester.make \
diff --git a/package/libqmi/patches/patch-autogen_sh b/package/libqmi/patches/patch-autogen_sh
new file mode 100644
index 000000000..cba4e8ea6
--- /dev/null
+++ b/package/libqmi/patches/patch-autogen_sh
@@ -0,0 +1,11 @@
+	- drop doc stuff which we don't have
+--- libqmi-1.12.4.orig/autogen.sh	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/autogen.sh	2015-02-20 18:05:46.425974772 +0100
+@@ -14,7 +14,6 @@ PKG_NAME=libqmi
+ }
+ 
+ (cd $srcdir;
+-    gtkdocize || exit 1
+     mkdir -p m4
+     touch README NEWS ChangeLog
+     autoreconf --force --install --verbose
diff --git a/package/libqmi/patches/patch-configure_ac b/package/libqmi/patches/patch-configure_ac
new file mode 100644
index 000000000..37f519c4e
--- /dev/null
+++ b/package/libqmi/patches/patch-configure_ac
@@ -0,0 +1,12 @@
+--- libqmi-1.12.4.orig/configure.ac	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/configure.ac	2015-02-27 22:15:42.000000000 +0100
+@@ -76,9 +76,6 @@ AC_SUBST(GLIB_LIBS)
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+ AC_SUBST(GLIB_MKENUMS)
+ 
+-dnl Documentation
+-GTK_DOC_CHECK(1.0)
+-
+ # QMI username
+ QMI_USERNAME="root"
+ AC_ARG_ENABLE(qmi-username,
diff --git a/package/libqmi/patches/patch-docs_reference_libqmi-glib_Makefile_am b/package/libqmi/patches/patch-docs_reference_libqmi-glib_Makefile_am
new file mode 100644
index 000000000..39fa9c415
--- /dev/null
+++ b/package/libqmi/patches/patch-docs_reference_libqmi-glib_Makefile_am
@@ -0,0 +1,25 @@
+	- try to avoid having to have gtk-doc stuff
+	- and try to prevent the mess involved with it
+--- libqmi-1.12.4.orig/docs/reference/libqmi-glib/Makefile.am	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/docs/reference/libqmi-glib/Makefile.am	2015-02-20 18:24:30.739430307 +0100
+@@ -73,9 +73,9 @@ expand_content_files =
+ 
+ extra_files =
+ 
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+ 
+-EXTRA_DIST += \
++EXTRA_DIST = \
+ 	libqmi-glib-common.sections \
+ 	$(DOC_MODULE)-sections.txt \
+ 	$(DOC_MODULE)-sections.mstamp \
+@@ -83,7 +83,7 @@ EXTRA_DIST += \
+ 	$(DIAGRAMS) \
+ 	$(NULL)
+ 
+-CLEANFILES += \
++CLEANFILES = \
+ 	$(DOC_MODULE)-decl-list.txt \
+ 	$(DOC_MODULE)-decl.txt \
+ 	$(DOC_MODULE)-overrides.txt \