summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/libzypp/libzypp/no-doc.patch31
-rw-r--r--meta/recipes-extended/libzypp/libzypp/rpm5.patch30
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb22
3 files changed, 83 insertions, 0 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/no-doc.patch b/meta/recipes-extended/libzypp/libzypp/no-doc.patch
new file mode 100644
index 0000000000..3928980e51
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/no-doc.patch
@@ -0,0 +1,31 @@
1not building doc (doxygen based)
2
38/19/2010 - created by Qing He <qing.he@intel.com>
4
5diff --git a/CMakeLists.txt b/CMakeLists.txt
6index 0629b1f..41746cc 100644
7--- a/CMakeLists.txt
8+++ b/CMakeLists.txt
9@@ -110,13 +110,6 @@ FIND_PACKAGE(EXPAT REQUIRED)
10 FIND_PACKAGE(OpenSSL REQUIRED)
11 FIND_PACKAGE(Udev REQUIRED)
12
13-FIND_PROGRAM( DOXYGEN doxygen )
14-IF ( NOT DOXYGEN )
15- MESSAGE( FATAL_ERROR "doxygen not found: install doxygen to build the documentation." )
16-ELSE ( NOT DOXYGEN )
17- MESSAGE( STATUS "doxygen found: ${DOXYGEN}" )
18-ENDIF ( NOT DOXYGEN )
19-
20 MESSAGE(STATUS "soname: ${LIBZYPP_VERSION_INFO}")
21 MESSAGE(STATUS "version: ${VERSION}")
22
23@@ -154,7 +147,7 @@ ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL )
24 ADD_SUBDIRECTORY( tools )
25 ADD_SUBDIRECTORY( examples )
26 ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL )
27-ADD_SUBDIRECTORY( doc )
28+#ADD_SUBDIRECTORY( doc )
29 ADD_SUBDIRECTORY( vendor )
30 ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL )
31
diff --git a/meta/recipes-extended/libzypp/libzypp/rpm5.patch b/meta/recipes-extended/libzypp/libzypp/rpm5.patch
new file mode 100644
index 0000000000..b86463dc54
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/rpm5.patch
@@ -0,0 +1,30 @@
1build fix for rpm5
2
38/19/2010 - created by Qing He <qing.he@intel.com>
4
5diff --git a/zypp/target/rpm/BinHeader.cc b/zypp/target/rpm/BinHeader.cc
6index e9ad382..86a9c96 100644
7--- a/zypp/target/rpm/BinHeader.cc
8+++ b/zypp/target/rpm/BinHeader.cc
9@@ -19,7 +19,7 @@ extern "C"
10
11 #ifndef _RPM_4_4_COMPAT
12 #ifdef _RPM_5
13-typedef rpmuint32_t rpm_count_t;
14+typedef uint32_t rpm_count_t;
15 #else
16 typedef int32_t rpm_count_t;
17 #endif
18diff --git a/zypp/target/rpm/librpmDb.cv3.cc b/zypp/target/rpm/librpmDb.cv3.cc
19index bf18e45..5454ea9 100644
20--- a/zypp/target/rpm/librpmDb.cv3.cc
21+++ b/zypp/target/rpm/librpmDb.cv3.cc
22@@ -14,7 +14,7 @@ extern "C"
23 {
24 #ifndef _RPM_4_4_COMPAT
25 #ifdef _RPM_5
26-typedef rpmuint32_t rpm_count_t;
27+typedef uint32_t rpm_count_t;
28 #else
29 typedef int32_t rpm_count_t;
30 #endif
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
new file mode 100644
index 0000000000..61a140050d
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -0,0 +1,22 @@
1HOMEPAGE = "http://en.opensue.org/Portal:Libzypp"
2DESCRIPTION = "The ZYpp Linux Software management framework"
3
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=11fccc94d26293d78cb4996cb17e5fa7"
6
7inherit cmake
8
9DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev"
10
11S = "${WORKDIR}/git"
12PV = "0.0-git${SRCPV}"
13PR = "r0"
14
15SRCREV = "4494797d5b0369365b1af63921de45b197ead64f"
16
17SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
18 file://no-doc.patch \
19 file://rpm5.patch"
20
21FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
22FILES_${PN}-dev += "${datadir}/cmake"