[arch-commits] Commit in source-highlight/repos/extra-x86_64 (4 files)
Jelle van der Waa
jelle at gemini.archlinux.org
Sat Aug 28 10:05:13 UTC 2021
Date: Saturday, August 28, 2021 @ 10:05:13
Author: jelle
Revision: 422633
archrelease: copy trunk to extra-x86_64
Added:
source-highlight/repos/extra-x86_64/PKGBUILD
(from rev 422632, source-highlight/trunk/PKGBUILD)
source-highlight/repos/extra-x86_64/source-highlight-gcc11.patch
(from rev 422632, source-highlight/trunk/source-highlight-gcc11.patch)
Deleted:
source-highlight/repos/extra-x86_64/PKGBUILD
source-highlight/repos/extra-x86_64/source-highlight-gcc11.patch
------------------------------+
PKGBUILD | 84 +++++++++++++++++++++--------------------
source-highlight-gcc11.patch | 68 ++++++++++++++++-----------------
2 files changed, 78 insertions(+), 74 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-28 10:05:03 UTC (rev 422632)
+++ PKGBUILD 2021-08-28 10:05:13 UTC (rev 422633)
@@ -1,40 +0,0 @@
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.9
-pkgrel=5
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('x86_64')
-url="https://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-source=(https://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz{,.sig}
- source-highlight-gcc11.patch)
-validpgpkeys=('E9FE8AE950CB07F5BEB2E805036A75309D33E5B5')
-sha512sums=('d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195'
- 'SKIP'
- '55f22121a2e7501c437f305790b34d330b9ad475a87ed4482527386c23424ed2eb8c1a563da41995573f0598e4a5c9096abbf414938f7e1305354bcc720944ec')
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < source-highlight-gcc11.patch # Fix build with GCC 11
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --with-bash-completion=/usr/share/bash-completion/completions
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make prefix="${pkgdir}/usr" bash_completiondir="${pkgdir}/usr/share/bash-completion/completions" install
-
- # PKGBUILD syntax highlighting
- echo -e "\npkgbuild = sh.lang" >> "${pkgdir}"/usr/share/${pkgname}/lang.map
-}
Copied: source-highlight/repos/extra-x86_64/PKGBUILD (from rev 422632, source-highlight/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-28 10:05:13 UTC (rev 422633)
@@ -0,0 +1,44 @@
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=source-highlight
+pkgver=3.1.9
+pkgrel=6
+pkgdesc="Convert source code to syntax highlighted document"
+arch=('x86_64')
+url="https://www.gnu.org/software/src-highlite/"
+license=('GPL')
+depends=('bash' 'boost-libs')
+makedepends=('ctags' 'boost')
+optdepends=('lesspipe: src-hilite-lesspipe.sh')
+source=(https://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz{,.sig}
+ source-highlight-gcc11.patch)
+validpgpkeys=('E9FE8AE950CB07F5BEB2E805036A75309D33E5B5')
+sha512sums=('d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195'
+ 'SKIP'
+ '55f22121a2e7501c437f305790b34d330b9ad475a87ed4482527386c23424ed2eb8c1a563da41995573f0598e4a5c9096abbf414938f7e1305354bcc720944ec')
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < source-highlight-gcc11.patch # Fix build with GCC 11
+
+ cd ${pkgname}-${pkgver}
+ sed -i 's/lesspipe/lesspipe.sh/' src/src-hilite-lesspipe.sh.in
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-bash-completion=/usr/share/bash-completion/completions
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make prefix="${pkgdir}/usr" bash_completiondir="${pkgdir}/usr/share/bash-completion/completions" install
+
+ # PKGBUILD syntax highlighting
+ echo -e "\npkgbuild = sh.lang" >> "${pkgdir}"/usr/share/${pkgname}/lang.map
+}
Deleted: source-highlight-gcc11.patch
===================================================================
--- source-highlight-gcc11.patch 2021-08-28 10:05:03 UTC (rev 422632)
+++ source-highlight-gcc11.patch 2021-08-28 10:05:13 UTC (rev 422633)
@@ -1,34 +0,0 @@
-From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
-From: Tom Tromey <tom at tromey.com>
-Date: Wed, 10 Jun 2020 20:38:27 -0600
-Subject: Remove "throw" specifications
-
-diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
-index 59a6d64..963178c 100644
---- a/lib/srchilite/fileutil.cc
-+++ b/lib/srchilite/fileutil.cc
-@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
- // FIXME avoid using a global variable
- std::string start_path;
-
--string readFile(const string &fileName) throw (IOException) {
-+string readFile(const string &fileName) {
- ifstream file(fileName.c_str());
-
- if (!file.is_open()) {
-diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
-index 7335a9b..042eb56 100644
---- a/lib/srchilite/fileutil.h
-+++ b/lib/srchilite/fileutil.h
-@@ -27,7 +27,7 @@ extern std::string start_path;
- * @return the contents of the file
- * @throw IOException
- */
--string readFile(const string &fileName) throw (IOException);
-+string readFile(const string &fileName);
-
- //char *read_file(const string &fileName);
-
---
-cgit v1.2.1
-
Copied: source-highlight/repos/extra-x86_64/source-highlight-gcc11.patch (from rev 422632, source-highlight/trunk/source-highlight-gcc11.patch)
===================================================================
--- source-highlight-gcc11.patch (rev 0)
+++ source-highlight-gcc11.patch 2021-08-28 10:05:13 UTC (rev 422633)
@@ -0,0 +1,34 @@
+From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
+From: Tom Tromey <tom at tromey.com>
+Date: Wed, 10 Jun 2020 20:38:27 -0600
+Subject: Remove "throw" specifications
+
+diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
+index 59a6d64..963178c 100644
+--- a/lib/srchilite/fileutil.cc
++++ b/lib/srchilite/fileutil.cc
+@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
+ // FIXME avoid using a global variable
+ std::string start_path;
+
+-string readFile(const string &fileName) throw (IOException) {
++string readFile(const string &fileName) {
+ ifstream file(fileName.c_str());
+
+ if (!file.is_open()) {
+diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
+index 7335a9b..042eb56 100644
+--- a/lib/srchilite/fileutil.h
++++ b/lib/srchilite/fileutil.h
+@@ -27,7 +27,7 @@ extern std::string start_path;
+ * @return the contents of the file
+ * @throw IOException
+ */
+-string readFile(const string &fileName) throw (IOException);
++string readFile(const string &fileName);
+
+ //char *read_file(const string &fileName);
+
+--
+cgit v1.2.1
+
More information about the arch-commits
mailing list