From 5deff56dc368c8b3955c1be25cb7db7d33260892 Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 22 Feb 2012 21:36:11 -0700 Subject: [PATCH 01/24] New package: libnsbmp-0.0.3 (for netsurf) --- srcpkgs/libnsbmp-devel | 1 + srcpkgs/libnsbmp/depends | 2 ++ srcpkgs/libnsbmp/libnsbmp-devel.template | 21 +++++++++++++++++ srcpkgs/libnsbmp/template | 30 ++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 120000 srcpkgs/libnsbmp-devel create mode 100644 srcpkgs/libnsbmp/depends create mode 100644 srcpkgs/libnsbmp/libnsbmp-devel.template create mode 100644 srcpkgs/libnsbmp/template diff --git a/srcpkgs/libnsbmp-devel b/srcpkgs/libnsbmp-devel new file mode 120000 index 00000000000..4be7d867219 --- /dev/null +++ b/srcpkgs/libnsbmp-devel @@ -0,0 +1 @@ +libnsbmp \ No newline at end of file diff --git a/srcpkgs/libnsbmp/depends b/srcpkgs/libnsbmp/depends new file mode 100644 index 00000000000..12f980f59d1 --- /dev/null +++ b/srcpkgs/libnsbmp/depends @@ -0,0 +1,2 @@ +abi_depends=">=0.0.3" +api_depends="${abi_depends}" diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template new file mode 100644 index 00000000000..41be0ed257c --- /dev/null +++ b/srcpkgs/libnsbmp/libnsbmp-devel.template @@ -0,0 +1,21 @@ +# Template file for 'libnsbmp-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libnsbmp + +do_install() { + mkdir -p ${DESTDIR}/usr/lib/pkgconfig + + sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \ + -e 's#MINOR#0#' -e 's#PATCH#3#' \ + -e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \ + ${wrksrc}/libnsbmp.pc.in \ + > ${DESTDIR}/usr/lib/pkgconfig/libnsbmp.pc + + + mv ${wrksrc}/include ${DESTDIR}/usr +} diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template new file mode 100644 index 00000000000..61eeca858d5 --- /dev/null +++ b/srcpkgs/libnsbmp/template @@ -0,0 +1,30 @@ +# Template build file for 'libnsbmp'. +pkgname=libnsbmp +version=0.0.3 +distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +short_desc="Decoding library for BMP and ICO images in C." +maintainer="davehome " +checksum=e0ccf851bf6dc9398b587f1b3f919773a49d7d2eb082b99ab5898217d73e47a2 +long_desc=" + libnsbmp is a decoding library for BMP and ICO image file formats, written + in C. It was developed as part of the NetSurf project and is available for + use by other software under the MIT licence. + + * Features + Decodes BMP files + Decodes ICO files" + +subpackages="${pkgname}-devel" + +wrksrc=${pkgname}-${version}-src + +Add_dependency build sed + +do_build() { + make ${makejobs} +} + +do_install() { + vinstall "build-Linux-Linux-release-lib-static/libnsbmp.a" \ + 0644 "usr/lib" +} From 7e772d57d5917c9b379fe22c05ec8744f2d1addd Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 22 Feb 2012 21:43:57 -0700 Subject: [PATCH 02/24] New package: libnsgif-0.0.3 (for netsurf) --- srcpkgs/libnsgif-devel | 1 + srcpkgs/libnsgif/depends | 2 ++ srcpkgs/libnsgif/libnsgif-devel.template | 21 +++++++++++++++++ srcpkgs/libnsgif/template | 29 ++++++++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 120000 srcpkgs/libnsgif-devel create mode 100644 srcpkgs/libnsgif/depends create mode 100644 srcpkgs/libnsgif/libnsgif-devel.template create mode 100644 srcpkgs/libnsgif/template diff --git a/srcpkgs/libnsgif-devel b/srcpkgs/libnsgif-devel new file mode 120000 index 00000000000..acaa2be89f7 --- /dev/null +++ b/srcpkgs/libnsgif-devel @@ -0,0 +1 @@ +libnsgif \ No newline at end of file diff --git a/srcpkgs/libnsgif/depends b/srcpkgs/libnsgif/depends new file mode 100644 index 00000000000..12f980f59d1 --- /dev/null +++ b/srcpkgs/libnsgif/depends @@ -0,0 +1,2 @@ +abi_depends=">=0.0.3" +api_depends="${abi_depends}" diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template new file mode 100644 index 00000000000..ab0178a1283 --- /dev/null +++ b/srcpkgs/libnsgif/libnsgif-devel.template @@ -0,0 +1,21 @@ +# Template file for 'libnsgif-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libnsgif + +do_install() { + mkdir -p ${DESTDIR}/usr/lib/pkgconfig + + sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \ + -e 's#MINOR#0#' -e 's#PATCH#3#' \ + -e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \ + ${wrksrc}/libnsgif.pc.in \ + > ${DESTDIR}/usr/lib/pkgconfig/libnsgif.pc + + + mv ${wrksrc}/include ${DESTDIR}/usr +} diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template new file mode 100644 index 00000000000..6cec3d7c2b2 --- /dev/null +++ b/srcpkgs/libnsgif/template @@ -0,0 +1,29 @@ +# Template build file for 'libnsgif'. +pkgname=libnsgif +version=0.0.3 +distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +short_desc="Decoding library for the GIF image file format, written in C." +maintainer="davehome " +checksum=1f53bb6cc449c3b108d7653ce876ec58745f184d5a6675a95f1fa8c937dfc6d5 +long_desc=" + libnsgif is a decoding library for the GIF image file format, written + in C. It was developed as part of the NetSurf project and is available + for use by other software under the MIT licence. + + * Features + Decodes GIF files" + +subpackages="${pkgname}-devel" + +wrksrc=${pkgname}-${version}-src + +Add_dependency build sed + +do_build() { + make ${makejobs} +} + +do_install() { + vinstall "build-Linux-Linux-release-lib-static/libnsgif.a" \ + 0644 "usr/lib" +} From 60e2f2932445f8d0bec36367ca0b9371276b910c Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 22 Feb 2012 22:08:21 -0700 Subject: [PATCH 03/24] New package: libparserutils-0.1.1 (for netsurf) --- srcpkgs/libparserutils-devel | 1 + srcpkgs/libparserutils/depends | 2 ++ .../libparserutils-devel.template | 15 ++++++++ srcpkgs/libparserutils/template | 36 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 120000 srcpkgs/libparserutils-devel create mode 100644 srcpkgs/libparserutils/depends create mode 100644 srcpkgs/libparserutils/libparserutils-devel.template create mode 100644 srcpkgs/libparserutils/template diff --git a/srcpkgs/libparserutils-devel b/srcpkgs/libparserutils-devel new file mode 120000 index 00000000000..76bd945de12 --- /dev/null +++ b/srcpkgs/libparserutils-devel @@ -0,0 +1 @@ +libparserutils \ No newline at end of file diff --git a/srcpkgs/libparserutils/depends b/srcpkgs/libparserutils/depends new file mode 100644 index 00000000000..56fb9e056a7 --- /dev/null +++ b/srcpkgs/libparserutils/depends @@ -0,0 +1,2 @@ +abi_depends=">=0.1.1" +api_depends="${abi_depends}" diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template new file mode 100644 index 00000000000..b42678aaaae --- /dev/null +++ b/srcpkgs/libparserutils/libparserutils-devel.template @@ -0,0 +1,15 @@ +# Template file for 'libparserutils-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libparserutils + +do_install() { + + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + +} diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template new file mode 100644 index 00000000000..fdcddfc1431 --- /dev/null +++ b/srcpkgs/libparserutils/template @@ -0,0 +1,36 @@ +# Template build file for 'libnsgif'. +pkgname=libparserutils +version=0.1.1 +distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +short_desc="Library for building efficient parsers, written in C." +maintainer="davehome " +checksum=8b79ba58d6fa63fa9c74b71482d93f2c5b2c22badac77265f3cc47f3f603f87d +long_desc=" + LibParserUtils is a library for building efficient parsers, written + in C. It was developed as part of the NetSurf project and is available + for use by other software under the MIT licence. + + * Features + No mandatory dependencies (iconv() implementation optional for + enhanced charset support) + A number of built-in character set converters + Mapping of character set names to/from MIB enum values + UTF-8 and UTF-16 (host endian) support functions + Various simple data structures (resizeable buffer, stack, vector) + A UTF-8 input stream + Simple C API + Portable + Shared library" + +subpackages="${pkgname}-devel" + +Add_dependency build sed +Add_dependency build perl + +do_build() { + make ${makejobs} +} + +do_install() { + make ${makejobs} PREFIX=/usr DESTDIR=${DESTDIR} install +} From 8dd7686e11857ff303958e70d5b5539be748fbbf Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 12:24:43 -0700 Subject: [PATCH 04/24] libnsbmp: fix to build/install properly. --- srcpkgs/libnsbmp/libnsbmp-devel.template | 14 ++++---------- srcpkgs/libnsbmp/libnsbmp.rshlibs | 1 + srcpkgs/libnsbmp/template | 10 +++++++--- 3 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/libnsbmp/libnsbmp.rshlibs diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template index 41be0ed257c..d769c31f000 100644 --- a/srcpkgs/libnsbmp/libnsbmp-devel.template +++ b/srcpkgs/libnsbmp/libnsbmp-devel.template @@ -1,5 +1,6 @@ # Template file for 'libnsbmp-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} @@ -8,14 +9,7 @@ long_desc="${long_desc} Add_dependency run libnsbmp do_install() { - mkdir -p ${DESTDIR}/usr/lib/pkgconfig - - sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \ - -e 's#MINOR#0#' -e 's#PATCH#3#' \ - -e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \ - ${wrksrc}/libnsbmp.pc.in \ - > ${DESTDIR}/usr/lib/pkgconfig/libnsbmp.pc - - - mv ${wrksrc}/include ${DESTDIR}/usr + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/libnsbmp/libnsbmp.rshlibs b/srcpkgs/libnsbmp/libnsbmp.rshlibs new file mode 100644 index 00000000000..631aa1dda40 --- /dev/null +++ b/srcpkgs/libnsbmp/libnsbmp.rshlibs @@ -0,0 +1 @@ +libc.so.6 diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template index 61eeca858d5..284d35871e0 100644 --- a/srcpkgs/libnsbmp/template +++ b/srcpkgs/libnsbmp/template @@ -1,6 +1,7 @@ # Template build file for 'libnsbmp'. pkgname=libnsbmp version=0.0.3 +revision=1 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Decoding library for BMP and ICO images in C." maintainer="davehome " @@ -21,10 +22,13 @@ wrksrc=${pkgname}-${version}-src Add_dependency build sed do_build() { - make ${makejobs} + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static } do_install() { - vinstall "build-Linux-Linux-release-lib-static/libnsbmp.a" \ - 0644 "usr/lib" + make ${makejobs} COMPONENT_TYPE=lib-shared \ + DESTDIR=${DESTDIR} PREFIX=/usr install + make ${makejobs} COMPONENT_TYPE=lib-static \ + DESTDIR=${DESTDIR} PREFIX=/usr install } From 6d6a68fc383692d44eed102c74a06991ac0bf5aa Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 12:25:00 -0700 Subject: [PATCH 05/24] libnsgif: fix to build/install properly. --- srcpkgs/libnsgif/libnsgif-devel.template | 14 ++++---------- srcpkgs/libnsgif/libnsgif.rshlibs | 1 + srcpkgs/libnsgif/template | 10 +++++++--- 3 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/libnsgif/libnsgif.rshlibs diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template index ab0178a1283..5a5ecfcb948 100644 --- a/srcpkgs/libnsgif/libnsgif-devel.template +++ b/srcpkgs/libnsgif/libnsgif-devel.template @@ -1,5 +1,6 @@ # Template file for 'libnsgif-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} @@ -8,14 +9,7 @@ long_desc="${long_desc} Add_dependency run libnsgif do_install() { - mkdir -p ${DESTDIR}/usr/lib/pkgconfig - - sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \ - -e 's#MINOR#0#' -e 's#PATCH#3#' \ - -e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \ - ${wrksrc}/libnsgif.pc.in \ - > ${DESTDIR}/usr/lib/pkgconfig/libnsgif.pc - - - mv ${wrksrc}/include ${DESTDIR}/usr + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/libnsgif/libnsgif.rshlibs b/srcpkgs/libnsgif/libnsgif.rshlibs new file mode 100644 index 00000000000..631aa1dda40 --- /dev/null +++ b/srcpkgs/libnsgif/libnsgif.rshlibs @@ -0,0 +1 @@ +libc.so.6 diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template index 6cec3d7c2b2..edc220a15c9 100644 --- a/srcpkgs/libnsgif/template +++ b/srcpkgs/libnsgif/template @@ -1,6 +1,7 @@ # Template build file for 'libnsgif'. pkgname=libnsgif version=0.0.3 +revision=1 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Decoding library for the GIF image file format, written in C." maintainer="davehome " @@ -20,10 +21,13 @@ wrksrc=${pkgname}-${version}-src Add_dependency build sed do_build() { - make ${makejobs} + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static } do_install() { - vinstall "build-Linux-Linux-release-lib-static/libnsgif.a" \ - 0644 "usr/lib" + make ${makejobs} COMPONENT_TYPE=lib-shared \ + DESTDIR=${DESTDIR} PREFIX=/usr install + make ${makejobs} COMPONENT_TYPE=lib-static \ + DESTDIR=${DESTDIR} PREFIX=/usr install } From 884806b8101160f929aff49fb46eb448deab91fa Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 12:25:30 -0700 Subject: [PATCH 06/24] libparserutils: fix to build/install properly. --- srcpkgs/libparserutils/libparserutils-devel.template | 3 ++- srcpkgs/libparserutils/libparserutils.rshlibs | 1 + srcpkgs/libparserutils/template | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/libparserutils/libparserutils.rshlibs diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template index b42678aaaae..be063de3b88 100644 --- a/srcpkgs/libparserutils/libparserutils-devel.template +++ b/srcpkgs/libparserutils/libparserutils-devel.template @@ -1,5 +1,6 @@ # Template file for 'libparserutils-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} @@ -11,5 +12,5 @@ do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib - + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/libparserutils/libparserutils.rshlibs b/srcpkgs/libparserutils/libparserutils.rshlibs new file mode 100644 index 00000000000..631aa1dda40 --- /dev/null +++ b/srcpkgs/libparserutils/libparserutils.rshlibs @@ -0,0 +1 @@ +libc.so.6 diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template index fdcddfc1431..c8d8f2a65eb 100644 --- a/srcpkgs/libparserutils/template +++ b/srcpkgs/libparserutils/template @@ -1,6 +1,7 @@ # Template build file for 'libnsgif'. pkgname=libparserutils version=0.1.1 +revision=1 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Library for building efficient parsers, written in C." maintainer="davehome " @@ -28,9 +29,13 @@ Add_dependency build sed Add_dependency build perl do_build() { - make ${makejobs} + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static } do_install() { - make ${makejobs} PREFIX=/usr DESTDIR=${DESTDIR} install + make ${makejobs} COMPONENT_TYPE=lib-shared \ + PREFIX=/usr DESTDIR=${DESTDIR} install + make ${makejobs} COMPONENT_TYPE=lib-static \ + PREFIX=/usr DESTDIR=${DESTDIR} install } From 797d8927d263923d888912b555a34bce3ad13a53 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 12:36:14 -0700 Subject: [PATCH 07/24] New package: libwapcaplet-0.1.0 (for netsurf) --- srcpkgs/libwapcaplet-devel | 1 + srcpkgs/libwapcaplet/depends | 2 ++ .../libwapcaplet/libwapcaplet-devel.template | 14 +++++++++ srcpkgs/libwapcaplet/libwapcaplet.rshlibs | 1 + srcpkgs/libwapcaplet/template | 31 +++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 120000 srcpkgs/libwapcaplet-devel create mode 100644 srcpkgs/libwapcaplet/depends create mode 100644 srcpkgs/libwapcaplet/libwapcaplet-devel.template create mode 100644 srcpkgs/libwapcaplet/libwapcaplet.rshlibs create mode 100644 srcpkgs/libwapcaplet/template diff --git a/srcpkgs/libwapcaplet-devel b/srcpkgs/libwapcaplet-devel new file mode 120000 index 00000000000..c12e300eeec --- /dev/null +++ b/srcpkgs/libwapcaplet-devel @@ -0,0 +1 @@ +libwapcaplet \ No newline at end of file diff --git a/srcpkgs/libwapcaplet/depends b/srcpkgs/libwapcaplet/depends new file mode 100644 index 00000000000..140f5aa7a9d --- /dev/null +++ b/srcpkgs/libwapcaplet/depends @@ -0,0 +1,2 @@ +abi_depends=">=0.1.0" +api_depends="${abi_depends}" diff --git a/srcpkgs/libwapcaplet/libwapcaplet-devel.template b/srcpkgs/libwapcaplet/libwapcaplet-devel.template new file mode 100644 index 00000000000..bb549e76331 --- /dev/null +++ b/srcpkgs/libwapcaplet/libwapcaplet-devel.template @@ -0,0 +1,14 @@ +# Template file for 'libwapcaplet-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libwapcaplet + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib +} diff --git a/srcpkgs/libwapcaplet/libwapcaplet.rshlibs b/srcpkgs/libwapcaplet/libwapcaplet.rshlibs new file mode 100644 index 00000000000..631aa1dda40 --- /dev/null +++ b/srcpkgs/libwapcaplet/libwapcaplet.rshlibs @@ -0,0 +1 @@ +libc.so.6 diff --git a/srcpkgs/libwapcaplet/template b/srcpkgs/libwapcaplet/template new file mode 100644 index 00000000000..35d095287af --- /dev/null +++ b/srcpkgs/libwapcaplet/template @@ -0,0 +1,31 @@ +# Template build file for 'libwapcaplet'. +pkgname=libwapcaplet +version=0.1.0 +distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +short_desc="String internment library, written in C" +maintainer="davehome " +checksum=e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7 +long_desc=" + LibWapcaplet is a string internment library, written in C. It provides + reference counted string interment and rapid string comparison + functionality. It was developed as part of the NetSurf project and is + available for use by other software under the MIT licence. For further + details, see the readme." + +subpackages="${pkgname}-devel" + +Add_dependency build sed + +wrksrc=${pkgname}-${version}-src + +do_build() { + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static +} + +do_install() { + make ${makejobs} COMPONENT_TYPE=lib-shared \ + PREFIX=/usr DESTDIR=${DESTDIR} install + make ${makejobs} COMPONENT_TYPE=lib-static \ + PREFIX=/usr DESTDIR=${DESTDIR} install +} From e502e60d0bd2f6e114dccb673fcbb0a7ace0c1d1 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 12:44:52 -0700 Subject: [PATCH 08/24] New package: libcss-0.1.1 (for netsurf) --- srcpkgs/libcss-devel | 1 + srcpkgs/libcss/depends | 2 ++ srcpkgs/libcss/libcss-devel.template | 14 ++++++++++ srcpkgs/libcss/libcss.rshlibs | 3 +++ srcpkgs/libcss/template | 40 ++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+) create mode 120000 srcpkgs/libcss-devel create mode 100644 srcpkgs/libcss/depends create mode 100644 srcpkgs/libcss/libcss-devel.template create mode 100644 srcpkgs/libcss/libcss.rshlibs create mode 100644 srcpkgs/libcss/template diff --git a/srcpkgs/libcss-devel b/srcpkgs/libcss-devel new file mode 120000 index 00000000000..f97cea8fc36 --- /dev/null +++ b/srcpkgs/libcss-devel @@ -0,0 +1 @@ +libcss \ No newline at end of file diff --git a/srcpkgs/libcss/depends b/srcpkgs/libcss/depends new file mode 100644 index 00000000000..56fb9e056a7 --- /dev/null +++ b/srcpkgs/libcss/depends @@ -0,0 +1,2 @@ +abi_depends=">=0.1.1" +api_depends="${abi_depends}" diff --git a/srcpkgs/libcss/libcss-devel.template b/srcpkgs/libcss/libcss-devel.template new file mode 100644 index 00000000000..1d19c6e58e2 --- /dev/null +++ b/srcpkgs/libcss/libcss-devel.template @@ -0,0 +1,14 @@ +# Template file for 'libcss-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libcss + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib +} diff --git a/srcpkgs/libcss/libcss.rshlibs b/srcpkgs/libcss/libcss.rshlibs new file mode 100644 index 00000000000..2b2a01e2bf3 --- /dev/null +++ b/srcpkgs/libcss/libcss.rshlibs @@ -0,0 +1,3 @@ +libparserutils.so.0 +libwapcaplet.so.0 +libc.so.6 diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template new file mode 100644 index 00000000000..5604372492e --- /dev/null +++ b/srcpkgs/libcss/template @@ -0,0 +1,40 @@ +# Template build file for 'libcss'. +pkgname=libcss +version=0.1.1 +distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +short_desc="CSS parser and selection engine, written in C." +maintainer="davehome " +checksum=383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0 +long_desc=" + LibCSS is a CSS (Cascading Style Sheet) parser and selection engine, + written in C. It was developed as part of the NetSurf project and is + available for use by other software under the MIT licence. For further + details, see the readme. + + * Features + Parses CSS, good and bad + Simple C API + Low memory usage + Fast selection engine + Portable + Shared library" + +subpackages="${pkgname}-devel" + +Add_dependency build sed +Add_dependency build pkg-config +Add_dependency build perl +Add_dependency build libparserutils-devel +Add_dependency build libwapcaplet-devel + +do_build() { + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static +} + +do_install() { + make ${makejobs} COMPONENT_TYPE=lib-shared \ + PREFIX=/usr DESTDIR=${DESTDIR} install + make ${makejobs} COMPONENT_TYPE=lib-static \ + PREFIX=/usr DESTDIR=${DESTDIR} install +} From d4c1afde91af90ecffc0f8fdb48013611ef4ecf8 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 12:49:32 -0700 Subject: [PATCH 09/24] New package: libhubbub-0.1.1 (for netsurf) --- srcpkgs/libhubbub-devel | 1 + srcpkgs/libhubbub/depends | 2 + srcpkgs/libhubbub/libhubbub-devel.template | 14 +++++++ srcpkgs/libhubbub/libhubbub.rshlibs | 2 + srcpkgs/libhubbub/template | 48 ++++++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 120000 srcpkgs/libhubbub-devel create mode 100644 srcpkgs/libhubbub/depends create mode 100644 srcpkgs/libhubbub/libhubbub-devel.template create mode 100644 srcpkgs/libhubbub/libhubbub.rshlibs create mode 100644 srcpkgs/libhubbub/template diff --git a/srcpkgs/libhubbub-devel b/srcpkgs/libhubbub-devel new file mode 120000 index 00000000000..a298af8da53 --- /dev/null +++ b/srcpkgs/libhubbub-devel @@ -0,0 +1 @@ +libhubbub \ No newline at end of file diff --git a/srcpkgs/libhubbub/depends b/srcpkgs/libhubbub/depends new file mode 100644 index 00000000000..56fb9e056a7 --- /dev/null +++ b/srcpkgs/libhubbub/depends @@ -0,0 +1,2 @@ +abi_depends=">=0.1.1" +api_depends="${abi_depends}" diff --git a/srcpkgs/libhubbub/libhubbub-devel.template b/srcpkgs/libhubbub/libhubbub-devel.template new file mode 100644 index 00000000000..e654d432987 --- /dev/null +++ b/srcpkgs/libhubbub/libhubbub-devel.template @@ -0,0 +1,14 @@ +# Template file for 'libhubbub-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libhubbub + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib +} diff --git a/srcpkgs/libhubbub/libhubbub.rshlibs b/srcpkgs/libhubbub/libhubbub.rshlibs new file mode 100644 index 00000000000..c9ad5d604b3 --- /dev/null +++ b/srcpkgs/libhubbub/libhubbub.rshlibs @@ -0,0 +1,2 @@ +libparserutils.so.0 +libc.so.6 diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template new file mode 100644 index 00000000000..a34fb0f7aa5 --- /dev/null +++ b/srcpkgs/libhubbub/template @@ -0,0 +1,48 @@ +# Template build file for 'libhubbub'. +pkgname=libhubbub +version=0.1.1 +distfiles="http://www.netsurf-browser.org/projects/releases/hubbub-${version}-src.tar.gz" +short_desc="HTML5 compliant parsing library, written in C." +maintainer="davehome " +checksum=363f1acf1ca3b3362bb84fc8ed9544b2207e7cb706ac176477ad00dc0d56782b +long_desc=" + Hubbub is an HTML5 compliant parsing library, written in C. It was + developed as part of the NetSurf project and is available for use + by other software under the MIT licence. + + The HTML5 specification defines a parsing algorithm, based on the + behaviour of mainstream browsers, which provides instructions for + how to parse all markup, both valid and invalid. As a result, Hubbub + parses web content well. + + * Features + Parses HTML, good and bad + Simple C API + Fast + Character encoding detection + Well-tested (~90% test coverage) + Portable + Shared library" + +subpackages="${pkgname}-devel" + +Add_dependency build sed +Add_dependency build perl +Add_dependency build pkg-config +Add_dependency build libxslt-devel +Add_dependency build json-c-devel +Add_dependency build libparserutils-devel + +wrksrc=hubbub-${version} + +do_build() { + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static +} + +do_install() { + make ${makejobs} COMPONENT_TYPE=lib-shared \ + PREFIX=/usr DESTDIR=${DESTDIR} install + make ${makejobs} COMPONENT_TYPE=lib-static \ + PREFIX=/usr DESTDIR=${DESTDIR} install +} From 5b6105df369deb0b82d50c23cc1e9744cf225939 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 13:10:37 -0700 Subject: [PATCH 10/24] New package: libdom-20120223 (for netsurf) --- srcpkgs/libdom-devel | 1 + srcpkgs/libdom/libdom-devel.template | 14 ++++++++++ srcpkgs/libdom/libdom.rshlibs | 5 ++++ srcpkgs/libdom/template | 42 ++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 120000 srcpkgs/libdom-devel create mode 100644 srcpkgs/libdom/libdom-devel.template create mode 100644 srcpkgs/libdom/libdom.rshlibs create mode 100644 srcpkgs/libdom/template diff --git a/srcpkgs/libdom-devel b/srcpkgs/libdom-devel new file mode 120000 index 00000000000..7a4d19a9f6f --- /dev/null +++ b/srcpkgs/libdom-devel @@ -0,0 +1 @@ +libdom \ No newline at end of file diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template new file mode 100644 index 00000000000..1ce61d69375 --- /dev/null +++ b/srcpkgs/libdom/libdom-devel.template @@ -0,0 +1,14 @@ +# Template file for 'libdom-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libdom + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib +} diff --git a/srcpkgs/libdom/libdom.rshlibs b/srcpkgs/libdom/libdom.rshlibs new file mode 100644 index 00000000000..1ba7d36222a --- /dev/null +++ b/srcpkgs/libdom/libdom.rshlibs @@ -0,0 +1,5 @@ +libparserutils.so.0 +libwapcaplet.so.0 +libxml2.so.2 +libhubbub.so.0 +libc.so.6 diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template new file mode 100644 index 00000000000..e5e8e60457b --- /dev/null +++ b/srcpkgs/libdom/template @@ -0,0 +1,42 @@ +# Template build file for 'libdom'. +pkgname=libdom +version="$(date -u +%Y%m%d)" +short_desc="Implementation of the W3C DOM, written in C." +maintainer="davehome " +long_desc=" + LibDOM is an implementation of the W3C DOM, written in C. It is + currently in development for use with NetSurf and is intended to + be suitable for use in other projects too. For further details, + see the readme." + +subpackages="${pkgname}-devel" + +nofetch=yes +noextract=yes + +Add_dependency build sed +Add_dependency build pkg-config +Add_dependency build perl +Add_dependency build subversion +Add_dependency build libxml2-devel +Add_dependency build libparserutils-devel +Add_dependency build libwapcaplet-devel +Add_dependency build libhubbub-devel + +do_fetch() { + local url="svn://svn.netsurf-browser.org/trunk/libdom" + msg_normal " Fetching source from $url ...\n" + svn co ${url} ${pkgname}-${version} +} + +do_build() { + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static +} + +do_install() { + make ${makejobs} COMPONENT_TYPE=lib-shared \ + PREFIX=/usr DESTDIR=${DESTDIR} install + make ${makejobs} COMPONENT_TYPE=lib-static \ + PREFIX=/usr DESTDIR=${DESTDIR} install +} From c6be28c08fc6e267b14cfa4ad4f0f1ea8c73f5c5 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 14:30:08 -0700 Subject: [PATCH 11/24] New package: netsurf-2.8 - Lighweight webbrowser. --- srcpkgs/netsurf/files/netsurf.desktop | 127 ++++++++++++++++++++++++++ srcpkgs/netsurf/netsurf.rshlibs | 28 ++++++ srcpkgs/netsurf/template | 80 ++++++++++++++++ 3 files changed, 235 insertions(+) create mode 100644 srcpkgs/netsurf/files/netsurf.desktop create mode 100644 srcpkgs/netsurf/netsurf.rshlibs create mode 100644 srcpkgs/netsurf/template diff --git a/srcpkgs/netsurf/files/netsurf.desktop b/srcpkgs/netsurf/files/netsurf.desktop new file mode 100644 index 00000000000..fcc39c4e80d --- /dev/null +++ b/srcpkgs/netsurf/files/netsurf.desktop @@ -0,0 +1,127 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Netsurf +Name[ar]=صافي تصفح +Name[ast]=Netsurf +Name[ca]=Netsurf +Name[cs]=Netsurf +Name[da]=Netsurf +Name[de]=Netsurf +Name[el]=καθαρού σερφ +Name[en_GB]=Netsurf +Name[es]=Netsurf +Name[et]=Netsurf +Name[fi]=Netsurf +Name[fr]=Netsurf +Name[gl]=Netsurf +Name[he]=Netsurf +Name[hr]=Netsurf +Name[hu]=Netsurf +Name[id]=Netsurf +Name[it]=Netsurf +Name[ja]=Netsurf +Name[ko]=인터넷 서핑 +Name[lt]=Netsurf +Name[nl]=Netsurf +Name[no]=Netsurf +Name[pl]=Netsurf +Name[pt]=Netsurf +Name[pt_BR]=Netsurf +Name[ro]=Netsurf +Name[ru]=Netsurf +Name[sk]=Netsurf +Name[sr]=нетсурф +Name[sr@latin]=Netsurf +Name[sv]=Netsurf +Name[tr]=Netsurf +Name[ug]=Netsurf +Name[uk]=Інтернет серфінгу +Name[zh_CN]=Netsurf 网冲浪 +Name[zh_TW]=Netsurf 網衝浪 +GenericName=Web Browser +GenericName[ar]=متصفح الوب +GenericName[ast]=Restolador +GenericName[ca]=Navegador web +GenericName[cs]=Internetový prohlížeč +GenericName[da]=Webbrowser +GenericName[de]=Internetbetrachter +GenericName[el]=Περιηγητής Ιστού +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=Verkkoselain +GenericName[fr]=Navigateur Internet +GenericName[gl]=Navegador web +GenericName[he]=דפדפן +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[id]=Peramban Web +GenericName[it]=Browser web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lt]=Interneto naršyklė +GenericName[nl]=Webbrowser +GenericName[no]=Nettleser +GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ +GenericName[pl]=Przeglądarka internetowa +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador web +GenericName[ro]=Navigator web +GenericName[ru]=Интернет-обозреватель +GenericName[sk]=Internetový prehliadač +GenericName[sr]=Интернет прегледник +GenericName[sr@latin]=Internet preglednik +GenericName[sv]=Webbläsare +GenericName[tr]=Web Tarayıcı +GenericName[ug]=توركۆرگۈ +GenericName[uk]=Переглядач Веб +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +Comment=Lightweight web browser +Comment[ar]=منصفح الوب الخفيف +Comment[ast]=Restolador llixeru +Comment[ca]=Navegador web lleuger +Comment[cs]=Odlehčený prohlížeč +Comment[da]=Letvægtig webbrowser +Comment[de]=Schlanker Internetbetrachter +Comment[el]=Ελαφρύς περιηγητής ιστού +Comment[en_GB]=Lightweight web browser +Comment[es]=Navegador web ligero +Comment[et]=Kergekaaluline veebibrauser +Comment[fi]=Kevyt verkkoselain +Comment[fr]=Navigateur Internet léger +Comment[gl]=Navegador web lixeiro +Comment[he]=דפדפן קל משקל +Comment[hr]=Lagani web preglednik +Comment[hu]=Könnyűsúlyú webböngésző +Comment[id]=Peramban web ringan +Comment[it]=Browser web leggero +Comment[ja]=軽量級ウェブブラウザ +Comment[ko]=가벼운 웹 브라우저 +Comment[lt]=Paprasta interneto naršyklė +Comment[nl]=Lichtgewicht webbrowser +Comment[no]=Lettvektig nettleser +Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ +Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej +Comment[pt]=Navegador Web rápido +Comment[pt_BR]=Navegador web leve +Comment[ro]=Mic navigator web +Comment[ru]=Легковесный Интернет-обозреватель +Comment[sk]=Ľahký internetový prehliadač +Comment[sr]=Једноставан Интернет прегледник +Comment[sr@latin]=Jednostavan Internet preglednik +Comment[sv]=Resurssnål webbläsare +Comment[tr]=Hafif web tarayıcı +Comment[ug]=يېنىك توركۆرگۈ +Comment[uk]=Легкий переглядач Веб +Comment[zh_CN]=轻量级网页浏览器 +Comment[zh_TW]=輕量級網頁瀏覽器 +Categories=GTK;Network;WebBrowser; +MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo; +Exec=netsurf %U +Icon=netsurf +Terminal=false +StartupNotify=true +X-Osso-Type=application/x-executable +X-Osso-Service=netsurf diff --git a/srcpkgs/netsurf/netsurf.rshlibs b/srcpkgs/netsurf/netsurf.rshlibs new file mode 100644 index 00000000000..beb7081f8f7 --- /dev/null +++ b/srcpkgs/netsurf/netsurf.rshlibs @@ -0,0 +1,28 @@ +libjpeg.so.8 +libmng.so.1 +libz.so.1 +libxml2.so.2 +libcurl.so.4 +libhubbub.so.0 +libcss.so.0 +libparserutils.so.0 +libwapcaplet.so.0 +libssl.so.1 +libcrypto.so.1 +librsvg-2.so.2 +libm.so.6 +libgdk_pixbuf-2.0.so.0 +libcairo.so.2 +libgobject-2.0.so.0 +libglib-2.0.so.0 +libnsbmp.so.0 +libnsgif.so.0 +libpng14.so.14 +libwebp.so.2 +libglade-2.0.so.0 +libgtk-x11-2.0.so.0 +libgdk-x11-2.0.so.0 +libpangocairo-1.0.so.0 +libpango-1.0.so.0 +libpthread.so.0 +libc.so.6 diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template new file mode 100644 index 00000000000..f42a10f0ed2 --- /dev/null +++ b/srcpkgs/netsurf/template @@ -0,0 +1,80 @@ +# Template build file for 'netsurf'. +pkgname=netsurf +version=2.8 +homepage="http://www.netsurf-browser.org" +distfiles="${homepage}/downloads/releases/${pkgname}-${version}-full-src.tar.gz" +short_desc="Free, open source web browser written in C." +maintainer="davehome " +LICENSE="GPL-2, MIT" +checksum=2055d52764faed054892670101fc95c1bf0bddc2370495250192f1855117b718 +long_desc=" + Small as a mouse, fast as a cheetah and available for free. NetSurf is + a multi-platform web browser for RISC OS, UNIX-like platforms (including + Linux), Mac OS X, and more. + + Written in C, this award winning open source project features its own + layout engine. It is licensed under GPL version 2. + + * Web standards: HTML 4.01 and CSS 2.1 + * Image formats: PNG, GIF, JPEG, SVG, JNG, MNG and BMP + * HTTPS for secure online transactions + * Unicode text + * Web page thumbnailing + * Local history trees + * Global history + * Hotlist manager (bookmarks) + * Cookie manager + * URL completion + * Text selection + * Scale view + * Search-as-you-type text search highlighting + * Save pages complete with images + * Fast, lightweight layout and rendering engine" + +gtk_iconcache_dirs="/usr/share/pixmaps" + +Add_dependency build sed +Add_dependency build pkg-config +Add_dependency build perl +Add_dependency build jpeg-devel +Add_dependency build libmng-devel +Add_dependency build libpng-devel +Add_dependency build librsvg-devel +Add_dependency build libxml2-devel +Add_dependency build libcurl-devel +Add_dependency build lcms-devel +Add_dependency build libwebp-devel +Add_dependency build libparserutils-devel +Add_dependency build libwapcaplet-devel +Add_dependency build libhubbub-devel +Add_dependency build libcss-devel +Add_dependency build libnsbmp-devel +Add_dependency build libnsgif-devel +Add_dependency build gtk+-devel +Add_dependency build libglade-devel + +Add_dependency full desktop-file-utils +Add_dependency full shared-mime-info + +do_build() { + make ${makejobs} --directory=${pkgname}-${version} \ + PREFIX=/usr TARGET=gtk NETSURF_USE_WEBP=YES +} + +do_install() { + make ${makejobs} --directory=${pkgname}-${version} \ + PREFIX=/usr DESTDIR=${DESTDIR} TARGET=gtk \ + NETSURF_USE_WEBP=YES install + + # Install app icon + vinstall "${DESTDIR}/usr/share/${pkgname}/${pkgname}.xpm" \ + 0644 usr/share/pixmaps + + # Install .desktop file (from Arch) + vinstall "${FILESDIR}/${pkgname}.desktop" \ + 0644 usr/share/applications + + # Install license + vinstall "${wrksrc}/${pkgname}-${version}/COPYING" \ + 0644 "/usr/share/licenses/${pkgname}" +} From a4a39bdfbf14884d1dc197f2217f1ebc94163bf9 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:25:30 -0700 Subject: [PATCH 12/24] netsurf: fix launcher icon --- srcpkgs/netsurf/files/netsurf.png | Bin 0 -> 16513 bytes srcpkgs/netsurf/template | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/netsurf/files/netsurf.png diff --git a/srcpkgs/netsurf/files/netsurf.png b/srcpkgs/netsurf/files/netsurf.png new file mode 100644 index 0000000000000000000000000000000000000000..c6526d8b161a02937b3c6a06aaaf86c55e6a0095 GIT binary patch literal 16513 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 Date: Thu, 23 Feb 2012 16:26:08 -0700 Subject: [PATCH 13/24] shlibs: add all netsurf stuff --- common/shlibs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/shlibs b/common/shlibs index 066b71aa5b9..bdde41594a1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -959,3 +959,10 @@ libsystemd-journal.so.0 systemd-libs systemd-devel libsystemd-login.so.0 systemd-libs systemd-devel libplist.so.1 libplist libplist-devel libplist++.so.1 libplist++ libplist-devel +libnsbmp.so.0 libnsbmp libnsbmp-devel +libnsgif.so.0 libnsgif libnsgif-devel +libparserutils.so.0 libparserutils libparserutils-devel +libwapcaplet.so.0 libwapcaplet libwapcaplet-devel +libcss.so.0 libcss libcss-devel +libhubbub.so.0 libhubbub libhubbub-devel +libdom.so.0 libdom libdom-devel From 0e8d7c7ff56baa7e4503765311daed40e950d9c6 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:28:56 -0700 Subject: [PATCH 14/24] libnsbmp: set homepage/license. --- srcpkgs/libnsbmp/libnsbmp-devel.template | 2 +- srcpkgs/libnsbmp/template | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template index d769c31f000..534b1df1a37 100644 --- a/srcpkgs/libnsbmp/libnsbmp-devel.template +++ b/srcpkgs/libnsbmp/libnsbmp-devel.template @@ -1,6 +1,6 @@ # Template file for 'libnsbmp-devel'. # -revision=1 +revision=2 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template index 284d35871e0..4f9da1e1243 100644 --- a/srcpkgs/libnsbmp/template +++ b/srcpkgs/libnsbmp/template @@ -1,11 +1,13 @@ # Template build file for 'libnsbmp'. pkgname=libnsbmp version=0.0.3 -revision=1 -distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +revision=2 +homepage="http://www.netsurf-browser.org" +distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Decoding library for BMP and ICO images in C." maintainer="davehome " checksum=e0ccf851bf6dc9398b587f1b3f919773a49d7d2eb082b99ab5898217d73e47a2 +license="MIT" long_desc=" libnsbmp is a decoding library for BMP and ICO image file formats, written in C. It was developed as part of the NetSurf project and is available for @@ -31,4 +33,6 @@ do_install() { DESTDIR=${DESTDIR} PREFIX=/usr install make ${makejobs} COMPONENT_TYPE=lib-static \ DESTDIR=${DESTDIR} PREFIX=/usr install + + vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}" } From b07379c218809df06af87f08ff01cfe689ab6677 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:32:19 -0700 Subject: [PATCH 15/24] libnsgif: set homepage/license --- srcpkgs/libnsgif/libnsgif-devel.template | 2 +- srcpkgs/libnsgif/template | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template index 5a5ecfcb948..8618293454a 100644 --- a/srcpkgs/libnsgif/libnsgif-devel.template +++ b/srcpkgs/libnsgif/libnsgif-devel.template @@ -1,6 +1,6 @@ # Template file for 'libnsgif-devel'. # -revision=1 +revision=2 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template index edc220a15c9..9d9d6783b38 100644 --- a/srcpkgs/libnsgif/template +++ b/srcpkgs/libnsgif/template @@ -1,11 +1,13 @@ # Template build file for 'libnsgif'. pkgname=libnsgif version=0.0.3 -revision=1 -distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +revision=2 +homepage="http://www.netsurf-browser.org" +distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Decoding library for the GIF image file format, written in C." maintainer="davehome " checksum=1f53bb6cc449c3b108d7653ce876ec58745f184d5a6675a95f1fa8c937dfc6d5 +license="MIT" long_desc=" libnsgif is a decoding library for the GIF image file format, written in C. It was developed as part of the NetSurf project and is available @@ -30,4 +32,6 @@ do_install() { DESTDIR=${DESTDIR} PREFIX=/usr install make ${makejobs} COMPONENT_TYPE=lib-static \ DESTDIR=${DESTDIR} PREFIX=/usr install + + vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}" } From c92d6c81f35f34f5602d27ac3c1cd979137977f0 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:36:28 -0700 Subject: [PATCH 16/24] libwapcaplet: add homepage/license --- srcpkgs/libwapcaplet/libwapcaplet-devel.template | 1 + srcpkgs/libwapcaplet/template | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libwapcaplet/libwapcaplet-devel.template b/srcpkgs/libwapcaplet/libwapcaplet-devel.template index bb549e76331..453c738f3bd 100644 --- a/srcpkgs/libwapcaplet/libwapcaplet-devel.template +++ b/srcpkgs/libwapcaplet/libwapcaplet-devel.template @@ -1,5 +1,6 @@ # Template file for 'libwapcaplet-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libwapcaplet/template b/srcpkgs/libwapcaplet/template index 35d095287af..65ae6bf12b9 100644 --- a/srcpkgs/libwapcaplet/template +++ b/srcpkgs/libwapcaplet/template @@ -1,10 +1,13 @@ # Template build file for 'libwapcaplet'. pkgname=libwapcaplet version=0.1.0 -distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +revision=1 +homepage="http://www.netsurf-browser.org" +distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="String internment library, written in C" maintainer="davehome " checksum=e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7 +license="MIT" long_desc=" LibWapcaplet is a string internment library, written in C. It provides reference counted string interment and rapid string comparison @@ -28,4 +31,6 @@ do_install() { PREFIX=/usr DESTDIR=${DESTDIR} install make ${makejobs} COMPONENT_TYPE=lib-static \ PREFIX=/usr DESTDIR=${DESTDIR} install + + vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}" } From 2bb6f9b2320a43ca64cf06513fb11c698e7994bb Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:36:42 -0700 Subject: [PATCH 17/24] libparserutils: add homepage/license --- srcpkgs/libparserutils/libparserutils-devel.template | 2 +- srcpkgs/libparserutils/template | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template index be063de3b88..7c2ca876006 100644 --- a/srcpkgs/libparserutils/libparserutils-devel.template +++ b/srcpkgs/libparserutils/libparserutils-devel.template @@ -1,6 +1,6 @@ # Template file for 'libparserutils-devel'. # -revision=1 +revision=2 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template index c8d8f2a65eb..96b5fca453a 100644 --- a/srcpkgs/libparserutils/template +++ b/srcpkgs/libparserutils/template @@ -1,11 +1,13 @@ # Template build file for 'libnsgif'. pkgname=libparserutils version=0.1.1 -revision=1 -distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +revision=2 +homepage="http://www.netsurf-browser.org" +distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Library for building efficient parsers, written in C." maintainer="davehome " checksum=8b79ba58d6fa63fa9c74b71482d93f2c5b2c22badac77265f3cc47f3f603f87d +license="MIT" long_desc=" LibParserUtils is a library for building efficient parsers, written in C. It was developed as part of the NetSurf project and is available @@ -38,4 +40,6 @@ do_install() { PREFIX=/usr DESTDIR=${DESTDIR} install make ${makejobs} COMPONENT_TYPE=lib-static \ PREFIX=/usr DESTDIR=${DESTDIR} install + + vinstall "${wrksrc}/COPYING" 0644 "usr/share/license/${pkgname}" } From 8fe126cb62c4d06b817913bc7a0600ef62fd16eb Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:40:36 -0700 Subject: [PATCH 18/24] libcss: set homepage/license --- srcpkgs/libcss/libcss-devel.template | 1 + srcpkgs/libcss/template | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libcss/libcss-devel.template b/srcpkgs/libcss/libcss-devel.template index 1d19c6e58e2..f931c3d7ade 100644 --- a/srcpkgs/libcss/libcss-devel.template +++ b/srcpkgs/libcss/libcss-devel.template @@ -1,5 +1,6 @@ # Template file for 'libcss-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template index 5604372492e..9ab5b58496f 100644 --- a/srcpkgs/libcss/template +++ b/srcpkgs/libcss/template @@ -1,10 +1,13 @@ # Template build file for 'libcss'. pkgname=libcss version=0.1.1 -distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" +revision=1 +homepage="http://www.netsurf-browser.org" +distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="CSS parser and selection engine, written in C." maintainer="davehome " checksum=383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0 +license="MIT" long_desc=" LibCSS is a CSS (Cascading Style Sheet) parser and selection engine, written in C. It was developed as part of the NetSurf project and is @@ -37,4 +40,6 @@ do_install() { PREFIX=/usr DESTDIR=${DESTDIR} install make ${makejobs} COMPONENT_TYPE=lib-static \ PREFIX=/usr DESTDIR=${DESTDIR} install + + vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}" } From d93a8ab88cb0c613bc8e73f5983ad9ea3f2b4a36 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:43:26 -0700 Subject: [PATCH 19/24] libhubbub: set homepage/license --- srcpkgs/libhubbub/libhubbub-devel.template | 1 + srcpkgs/libhubbub/template | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libhubbub/libhubbub-devel.template b/srcpkgs/libhubbub/libhubbub-devel.template index e654d432987..a31330b6aa0 100644 --- a/srcpkgs/libhubbub/libhubbub-devel.template +++ b/srcpkgs/libhubbub/libhubbub-devel.template @@ -1,5 +1,6 @@ # Template file for 'libhubbub-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template index a34fb0f7aa5..581c2038670 100644 --- a/srcpkgs/libhubbub/template +++ b/srcpkgs/libhubbub/template @@ -1,10 +1,13 @@ # Template build file for 'libhubbub'. pkgname=libhubbub version=0.1.1 -distfiles="http://www.netsurf-browser.org/projects/releases/hubbub-${version}-src.tar.gz" +revision=1 +homepage="http://www.netsurf-browser.org" +distfiles="${homepage}/projects/releases/hubbub-${version}-src.tar.gz" short_desc="HTML5 compliant parsing library, written in C." maintainer="davehome " checksum=363f1acf1ca3b3362bb84fc8ed9544b2207e7cb706ac176477ad00dc0d56782b +license="MIT" long_desc=" Hubbub is an HTML5 compliant parsing library, written in C. It was developed as part of the NetSurf project and is available for use @@ -45,4 +48,6 @@ do_install() { PREFIX=/usr DESTDIR=${DESTDIR} install make ${makejobs} COMPONENT_TYPE=lib-static \ PREFIX=/usr DESTDIR=${DESTDIR} install + + vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}" } From 2aa7bb655c46e3d66ee85ee0d75dfb8fb1c1783a Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:50:17 -0700 Subject: [PATCH 20/24] libdom: set homepage/license --- srcpkgs/libdom/libdom-devel.template | 1 + srcpkgs/libdom/template | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template index 1ce61d69375..4709a93c720 100644 --- a/srcpkgs/libdom/libdom-devel.template +++ b/srcpkgs/libdom/libdom-devel.template @@ -1,5 +1,6 @@ # Template file for 'libdom-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template index e5e8e60457b..6b71ac3b4b1 100644 --- a/srcpkgs/libdom/template +++ b/srcpkgs/libdom/template @@ -1,8 +1,11 @@ # Template build file for 'libdom'. pkgname=libdom version="$(date -u +%Y%m%d)" +revision=1 +homepage="http://www.netsurf-browser.org" short_desc="Implementation of the W3C DOM, written in C." maintainer="davehome " +license="MIT" long_desc=" LibDOM is an implementation of the W3C DOM, written in C. It is currently in development for use with NetSurf and is intended to @@ -39,4 +42,6 @@ do_install() { PREFIX=/usr DESTDIR=${DESTDIR} install make ${makejobs} COMPONENT_TYPE=lib-static \ PREFIX=/usr DESTDIR=${DESTDIR} install + + vinstall "${wrksrc}/COPYING" 644 "usr/share/license/${pkgname}" } From 5d8f8740ab3142dfeafd6daebf73fbe4485f46c8 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 16:50:53 -0700 Subject: [PATCH 21/24] netsurf: fix license. --- srcpkgs/netsurf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index 1f6e8e2e83c..91acadb6c1a 100644 --- a/srcpkgs/netsurf/template +++ b/srcpkgs/netsurf/template @@ -1,12 +1,12 @@ # Template build file for 'netsurf'. pkgname=netsurf version=2.8 -revision=1 +revision=2 homepage="http://www.netsurf-browser.org" distfiles="${homepage}/downloads/releases/${pkgname}-${version}-full-src.tar.gz" short_desc="Free, open source web browser written in C." maintainer="davehome " -LICENSE="GPL-2, MIT" +license="GPL-2, MIT" checksum=2055d52764faed054892670101fc95c1bf0bddc2370495250192f1855117b718 long_desc=" Small as a mouse, fast as a cheetah and available for free. NetSurf is From c0ff1140442f5784a9d5180fc96c03d7ee61012c Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 17:09:38 -0700 Subject: [PATCH 22/24] wine-unstable: fix version number --- srcpkgs/wine-unstable/libwine-unstable.template | 2 +- srcpkgs/wine-unstable/template | 11 +++++++---- srcpkgs/wine-unstable/wine-unstable-devel.template | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template index 2ee780cf573..b9c13a47c4e 100644 --- a/srcpkgs/wine-unstable/libwine-unstable.template +++ b/srcpkgs/wine-unstable/libwine-unstable.template @@ -6,7 +6,7 @@ long_desc="${long_desc} This package contains the wine runtime." only_for_archs=i686 -replaces="libwine>=0" +replaces="libwine>=0 libwine-unstable>=1.4-rc4" provides="libwine-$version" conflicts="libwine>=0" diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template index b7c9cdfe3c6..7df0ba00efb 100644 --- a/srcpkgs/wine-unstable/template +++ b/srcpkgs/wine-unstable/template @@ -1,12 +1,15 @@ # Template file for 'wine-unstable' __pkgname=wine pkgname=${__pkgname}-unstable -version=1.4-rc4 -wrksrc=${__pkgname}-$version +__majminver=1.4 +__rcver=rc4 +__otherversion=${__magminver}-${__rcver} +version=${__majminver}.${__rcver} +wrksrc=${__pkgname}-${__otherversion} build_style=gnu-configure configure_args="--with-x" homepage="http://www.winehq.org/" -distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${version}.tar.bz2" +distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${__otherversion}.tar.bz2" short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)" maintainer="davehome " license="LGPL-2.1" @@ -18,7 +21,7 @@ long_desc=" only_for_archs=i686 build_requires=11 -replaces="wine>=0" +replaces="wine>=0 wine-unstable>=1.4-rc4" provides="wine-$version" conflicts="wine>=0" subpackages="lib$pkgname $pkgname-devel" diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template index 456ca4b891a..e70d7a7cab9 100644 --- a/srcpkgs/wine-unstable/wine-unstable-devel.template +++ b/srcpkgs/wine-unstable/wine-unstable-devel.template @@ -6,7 +6,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." only_for_archs=i686 -replaces="wine-devel>=0" +replaces="wine-devel>=0 wine-unstable-devel>=1.4-rc4" provides="wine-devel-$version" conflicts="wine-devel>=0" From 91bb970ac2b9b314495bf494c1fb8f36fc752c43 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 17:32:21 -0700 Subject: [PATCH 23/24] wine-unstable: fix version again. --- srcpkgs/wine-unstable/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template index 7df0ba00efb..4f8c04d33a5 100644 --- a/srcpkgs/wine-unstable/template +++ b/srcpkgs/wine-unstable/template @@ -3,7 +3,7 @@ __pkgname=wine pkgname=${__pkgname}-unstable __majminver=1.4 __rcver=rc4 -__otherversion=${__magminver}-${__rcver} +__otherversion=${__majminver}-${__rcver} version=${__majminver}.${__rcver} wrksrc=${__pkgname}-${__otherversion} build_style=gnu-configure From 644e66c00d110da38f855298c4f804c9051415f6 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 17:37:23 -0700 Subject: [PATCH 24/24] libdom: remove revision, new day == new pkg --- srcpkgs/libdom/libdom-devel.template | 1 - srcpkgs/libdom/template | 1 - 2 files changed, 2 deletions(-) diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template index 4709a93c720..1ce61d69375 100644 --- a/srcpkgs/libdom/libdom-devel.template +++ b/srcpkgs/libdom/libdom-devel.template @@ -1,6 +1,5 @@ # Template file for 'libdom-devel'. # -revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template index 6b71ac3b4b1..d24134f2c22 100644 --- a/srcpkgs/libdom/template +++ b/srcpkgs/libdom/template @@ -1,7 +1,6 @@ # Template build file for 'libdom'. pkgname=libdom version="$(date -u +%Y%m%d)" -revision=1 homepage="http://www.netsurf-browser.org" short_desc="Implementation of the W3C DOM, written in C." maintainer="davehome "