From 5804b30951ccc2dd73ee1838bcb0d715852821f5 Mon Sep 17 00:00:00 2001 From: norvegh Date: Tue, 19 May 2015 12:59:17 +0200 Subject: [PATCH 1/5] New package: libkomparediff2-4.14.2 --- common/shlibs | 3 ++- srcpkgs/libkomparediff2-devel | 1 + srcpkgs/libkomparediff2/template | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/libkomparediff2-devel create mode 100644 srcpkgs/libkomparediff2/template diff --git a/common/shlibs b/common/shlibs index eb0cd5e3744..69c901e24e8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1980,7 +1980,7 @@ libpaper.so.1 libpaper-1.1.24_1 libhtsjava.so.2 httrack-3.48.21_1 libhttrack.so.2 httrack-3.48.21_1 libfstrm.so.0 fstrm-0.2.0_1 -libbg.so.2 bglibs-2.03_3 +libbg.so.2 bglibs-2.03_3 libcvm-command.so.1 cvm-0.97_1 libcvm-local.so.1 cvm-0.97_1 libcvm-module.so.1 cvm-0.97_1 @@ -2031,3 +2031,4 @@ libiec61883.so.0 libiec61883-1.2.0_1 libffado.so.2 libffado-2.2.1_1 libossp-uuid.so.16 libossp-1.6.2_1 libplayerctl-1.0.so.0 playerctl-0.4.2_1 +libkomparediff2.so.4 libkomparediff2-4.14.2_1 diff --git a/srcpkgs/libkomparediff2-devel b/srcpkgs/libkomparediff2-devel new file mode 120000 index 00000000000..8c3ed954904 --- /dev/null +++ b/srcpkgs/libkomparediff2-devel @@ -0,0 +1 @@ +libkomparediff2/ \ No newline at end of file diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template new file mode 100644 index 00000000000..1a77eae8dde --- /dev/null +++ b/srcpkgs/libkomparediff2/template @@ -0,0 +1,24 @@ +# Template file for 'libkomparediff2' +pkgname=libkomparediff2 +version=4.14.2 +revision=1 +short_desc="Library to compare files and strings" +maintainer="Norbert Vegh " +license="GPL-2+" +homepage="http://www.kde.org/" +distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" +checksum=70c670a69a0b31ab8fb12ccda54662e0f435fed9d9a2b390de68150a1c1e0e6a +build_style=cmake +hostmakedepends="cmake automoc4 pkg-config" +makedepends="kdelibs-devel qt-devel phonon-devel" + +libkomparediff2-devel_package() +{ + depends="libkomparediff2>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() + { + vmove usr/include/libkomparediff2 + vmove usr/lib/cmake/libkomparediff2 + } +} From d8dc485d6b480416212eaf320ab9fdc3f348cc36 Mon Sep 17 00:00:00 2001 From: norvegh Date: Tue, 19 May 2015 13:19:20 +0200 Subject: [PATCH 2/5] New package: kompare --- common/shlibs | 2 ++ srcpkgs/kompare/template | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 srcpkgs/kompare/template diff --git a/common/shlibs b/common/shlibs index 69c901e24e8..a7c568691ab 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2032,3 +2032,5 @@ libffado.so.2 libffado-2.2.1_1 libossp-uuid.so.16 libossp-1.6.2_1 libplayerctl-1.0.so.0 playerctl-0.4.2_1 libkomparediff2.so.4 libkomparediff2-4.14.2_1 +libkompareinterface.so.4 kompare-4.14.2_1 +libkomparedialogpages.so.4 kompare-4.14.2_1 diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template new file mode 100644 index 00000000000..7ac2e4fa626 --- /dev/null +++ b/srcpkgs/kompare/template @@ -0,0 +1,13 @@ +# Template file for 'kompare' +pkgname=kompare +version=4.14.2 +revision=1 +short_desc="File difference viewer" +maintainer="Norbert Vegh " +license="GPL-2" +homepage="http://www.caffeinated.me.uk/kompare/" +distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" +checksum=aeb210d0601573e302ea772e5e4e3b9ea20628de38288169fec4b74bbd69eaa8 +build_style=cmake +hostmakedepends="cmake automoc4 pkg-config" +makedepends="kdelibs-devel qt-devel phonon-devel libkomparediff2-devel" From 47d9c5523e8401a5455a102bb7c01f4e0e00b112 Mon Sep 17 00:00:00 2001 From: norvegh Date: Thu, 21 May 2015 18:35:21 +0200 Subject: [PATCH 3/5] libkomparediff2: fixed devel package --- srcpkgs/libkomparediff2/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template index 1a77eae8dde..e68a302d3ad 100644 --- a/srcpkgs/libkomparediff2/template +++ b/srcpkgs/libkomparediff2/template @@ -12,13 +12,12 @@ build_style=cmake hostmakedepends="cmake automoc4 pkg-config" makedepends="kdelibs-devel qt-devel phonon-devel" -libkomparediff2-devel_package() -{ +libkomparediff2-devel_package() { depends="libkomparediff2>=${version}_${revision}" short_desc+=" - development files" - pkg_install() - { + pkg_install() { vmove usr/include/libkomparediff2 vmove usr/lib/cmake/libkomparediff2 + vmove "usr/lib/*.so" } } From 6b59d1d6815a8dfbd117853e8ee7d996c82a4607 Mon Sep 17 00:00:00 2001 From: norvegh Date: Sun, 24 May 2015 09:24:46 +0200 Subject: [PATCH 4/5] libkomparediff2: minor fixes --- srcpkgs/libkomparediff2/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template index e68a302d3ad..07f28fbbc85 100644 --- a/srcpkgs/libkomparediff2/template +++ b/srcpkgs/libkomparediff2/template @@ -13,11 +13,11 @@ hostmakedepends="cmake automoc4 pkg-config" makedepends="kdelibs-devel qt-devel phonon-devel" libkomparediff2-devel_package() { - depends="libkomparediff2>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include/libkomparediff2 - vmove usr/lib/cmake/libkomparediff2 - vmove "usr/lib/*.so" - } + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } } From 78a160e242b56ad4487f8a04a589641fe22979ae Mon Sep 17 00:00:00 2001 From: norvegh Date: Thu, 28 May 2015 17:04:01 +0200 Subject: [PATCH 5/5] kompare and libkomparediff2: bumped version to 4.14.3 --- srcpkgs/kompare/template | 4 ++-- srcpkgs/libkomparediff2/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template index 7ac2e4fa626..6681633d1e3 100644 --- a/srcpkgs/kompare/template +++ b/srcpkgs/kompare/template @@ -1,13 +1,13 @@ # Template file for 'kompare' pkgname=kompare -version=4.14.2 +version=4.14.3 revision=1 short_desc="File difference viewer" maintainer="Norbert Vegh " license="GPL-2" homepage="http://www.caffeinated.me.uk/kompare/" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=aeb210d0601573e302ea772e5e4e3b9ea20628de38288169fec4b74bbd69eaa8 +checksum=24ee553dd0723bbf988b6fa581cd88f013ded3787a5be8706530b1f0e7e1177e build_style=cmake hostmakedepends="cmake automoc4 pkg-config" makedepends="kdelibs-devel qt-devel phonon-devel libkomparediff2-devel" diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template index 07f28fbbc85..5e87cb3564d 100644 --- a/srcpkgs/libkomparediff2/template +++ b/srcpkgs/libkomparediff2/template @@ -1,13 +1,13 @@ # Template file for 'libkomparediff2' pkgname=libkomparediff2 -version=4.14.2 +version=4.14.3 revision=1 short_desc="Library to compare files and strings" maintainer="Norbert Vegh " license="GPL-2+" homepage="http://www.kde.org/" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=70c670a69a0b31ab8fb12ccda54662e0f435fed9d9a2b390de68150a1c1e0e6a +checksum=bf9a9170d5655685468175a3ce4b393bcd108142b5522186f0e87cedb338a62f build_style=cmake hostmakedepends="cmake automoc4 pkg-config" makedepends="kdelibs-devel qt-devel phonon-devel"