diff --git a/common/shlibs b/common/shlibs index dd0e3344143..eeba17dad73 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2489,7 +2489,7 @@ libCEGUISILLYImageCodec.so cegui-0.8.7_1 libct.so.4 freetds-0.95.19_1 libsybdb.so.5 freetds-0.95.19_1 libqqwing.so.2 qqwing-1.3.4_1 -libiniparser.so.1 iniparser-4.1_1 +libiniparser.so.4 iniparser-4.2.4_1 libzita-resampler.so.1 zita-resampler-1.3.0_1 libmlt.so.6 mlt-6.4.1_1 libmlt++.so.3 mlt-6.4.1_1 diff --git a/srcpkgs/iniparser-example b/srcpkgs/iniparser-example deleted file mode 120000 index 237c429bcdd..00000000000 --- a/srcpkgs/iniparser-example +++ /dev/null @@ -1 +0,0 @@ -iniparser \ No newline at end of file diff --git a/srcpkgs/iniparser/files/iniparser.pc b/srcpkgs/iniparser/files/iniparser.pc deleted file mode 100644 index 8f820f01bc8..00000000000 --- a/srcpkgs/iniparser/files/iniparser.pc +++ /dev/null @@ -1,11 +0,0 @@ -# Package configuration for @PKGNAME@-@VERSION@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: @PKGNAME@ -Description: Library to parse ini files -Version: @VERSION@ -Libs: -L${libdir} -liniparser -Cflags: -I${includedir} diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template index fb813c7d870..9c6e2f248e9 100644 --- a/srcpkgs/iniparser/template +++ b/srcpkgs/iniparser/template @@ -1,49 +1,20 @@ # Template file for 'iniparser' pkgname=iniparser -version=4.1 -revision=3 -build_style=gnu-makefile -hostmakedepends="doxygen chrpath" +version=4.2.4 +revision=1 +build_style=cmake +configure_args="-DBUILD_EXAMPLES=OFF" +hostmakedepends="doxygen" short_desc="Free stand-alone ini file parsing library" maintainer="Orphaned " license="MIT" -homepage="http://ndevilla.free.fr/iniparser/" -distfiles="https://github.com/ndevilla/iniparser/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae +homepage="https://gitlab.com/iniparser/iniparser" +changelog="https://gitlab.com/iniparser/iniparser/-/releases" +distfiles="https://gitlab.com/iniparser/iniparser/-/archive/v${version}/iniparser-v${version}.tar.gz" +checksum=3b6a6cf85d18727371d7c02f548e9e34fa311a9244c504690f21d508168bd70e -CFLAGS="-fPIC" - -post_build() { - make docs -} - -do_install() { +post_install() { vlicense LICENSE - - # Install header files - vmkdir usr/include - vcopy "src/*.h" usr/include - - # Install libraries - vmkdir usr/lib - vcopy "libiniparser.*" usr/lib - ln -s libiniparser.so.1 ${DESTDIR}/usr/lib/libiniparser.so - chrpath -d ${DESTDIR}/usr/lib/libiniparser.so - - # Install pkg-config file - vmkdir usr/lib/pkgconfig - sed ${FILESDIR}/${pkgname}.pc \ - -e "s;@PKGNAME@;$pkgname;g" \ - -e "s;@VERSION@;$version;g" \ - > ${DESTDIR}/usr/lib/pkgconfig/${pkgname}.pc - - # Install example source and binaries - vmkdir usr/share/${pkgname}/example - vcopy "${wrksrc}/example/*" usr/share/${pkgname}/example - - # Install documentation - vmkdir usr/share/doc/${pkgname} - vcopy "${wrksrc}/html/*" usr/share/doc/${pkgname} } iniparser-devel_package() { @@ -51,20 +22,16 @@ iniparser-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" } } + iniparser-doc_package() { short_desc+=" - documentation" pkg_install() { vmove usr/share/doc/iniparser } } -iniparser-example_package() { - short_desc+=" - example code" - pkg_install() { - vmove usr/share/iniparser/example - } -}