[arch-commits] Commit in dmd/trunk (PKGBUILD dmd-doc.desktop)

2019-03-16 Thread Dan Printzell via arch-commits
Date: Saturday, March 16, 2019 @ 23:03:14
  Author: wild
Revision: 442253

upgpkg: dmd 1:2.085.0-1

Updated to 2.085.0

Modified:
  dmd/trunk/PKGBUILD
  dmd/trunk/dmd-doc.desktop

-+
 PKGBUILD|   10 --
 dmd-doc.desktop |2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 22:40:36 UTC (rev 442252)
+++ PKGBUILD2019-03-16 23:03:14 UTC (rev 442253)
@@ -11,7 +11,7 @@
 pkgdesc='D programming language compiler and standard library'
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
-pkgver=2.084.1
+pkgver=2.085.0
 pkgrel=1
 epoch=1
 arch=('x86_64')
@@ -27,10 +27,10 @@
 sha256sums=('SKIP'
 'SKIP'
 'SKIP'
-'7af3b28db8ee7d6de5f8dc53827dd9ea1520830da373c07d26cf974c2038d8db'
+'25d53bb87ff337f99984fcf77d4216d0b9af53ce9dfaf1c3fadf9c3959338487'
 'SKIP'
 '3d639e89528fed1da90006f4dfb2b0fdc41308da5a96d953381ff4ccf257c035'
-'19c9cd3670bdef7fbde88de36c459d940e6b7bacc2a5e48aefbfd1b2c1895e07')
+'4b7b8722b3fa11082f0f332397b1b66c85b30ce773c43c3fedcba5768a1484b1')
 validpgpkeys=('AFC7DB45693D62BB472BF27BAB8FE924C2F7E724') # Martin Nowak 

 noextract=("dmd.$pkgver.linux.tar.xz")
 
@@ -43,10 +43,8 @@
 
 # Add $LDFLAGS and $CXXFLAGS to the compilation
 # '-link-defaultlib-shared=false' statically links dmd to liblphobos
-_linkflags=$(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed "s/,/ 
-L=/g")
-
 sed -i "/^CXXFLAGS :=/ a $CXXFLAGS " "$srcdir"/dmd/src/posix.mak
-sed -i "/^DFLAGS=/ a override DFLAGS += -link-defaultlib-shared=false 
$_linkflags" "$srcdir"/dmd/src/posix.mak
+sed -i "/^DFLAGS=/ a override DFLAGS += -link-defaultlib-shared=false 
-L=\"$LDFLAGS\"" "$srcdir"/dmd/src/posix.mak
 sed -i "/^DFLAGS=/ a override DFLAGS += $_linkflags" 
"$srcdir"/druntime/posix.mak
 sed -i "/^DFLAGS=/ a override DFLAGS += $_linkflags" 
"$srcdir"/phobos/posix.mak
 }

Modified: dmd-doc.desktop
===
--- dmd-doc.desktop 2019-03-16 22:40:36 UTC (rev 442252)
+++ dmd-doc.desktop 2019-03-16 23:03:14 UTC (rev 442253)
@@ -2,6 +2,6 @@
 Type=Application
 Name=dmd/phobos documentation
 Comment=dmd compiler and phobos library documentation
-Exec=xdg-open /usr/share/d/html/d/language-reference.html
+Exec=xdg-open /usr/share/d/html/d/spec/intro.html
 Icon=dmd-doc
 Categories=Development;


[arch-commits] Commit in dmd/trunk (PKGBUILD dmd-doc.desktop)

2017-09-08 Thread Dan Printzell
Date: Friday, September 8, 2017 @ 23:38:12
  Author: wild
Revision: 256455

upgpkg: dmd 1:2.076.0-2

Added documentation as requested by ticket FS#55508

Added:
  dmd/trunk/dmd-doc.desktop
Modified:
  dmd/trunk/PKGBUILD

-+
 PKGBUILD|   49 +++--
 dmd-doc.desktop |7 +++
 2 files changed, 46 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-08 22:05:22 UTC (rev 256454)
+++ PKGBUILD2017-09-08 23:38:12 UTC (rev 256455)
@@ -7,27 +7,40 @@
 # Contributor: Anders Bergh 
 # Contributor: Alexander Fehr 
 
-pkgname=('dmd' 'libphobos')
+pkgname=('dmd' 'dmd-doc' 'libphobos')
 pkgdesc="D programming language compiler and standard library"
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
 pkgver=2.076.0
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('x86_64')
 url="http://www.dlang.org;
 makedepends=('git' 'dmd')
-source=("git+https://github.com/D-Programming-Language/dmd.git#tag=v$pkgver;
-
"git+https://github.com/D-Programming-Language/druntime.git#tag=v$pkgver;
-"git+https://github.com/D-Programming-Language/phobos.git#tag=v$pkgver;
-"dmd.conf")
+source=("git+https://github.com/dlang/dmd.git#tag=v$pkgver;
+"git+https://github.com/dlang/druntime.git#tag=v$pkgver;
+"git+https://github.com/dlang/phobos.git#tag=v$pkgver;
+
"http://downloads.dlang.org/releases/2.x/$pkgver/dmd.$pkgver.linux.tar.xz;
+
"http://downloads.dlang.org/releases/2.x/$pkgver/dmd.$pkgver.linux.tar.xz.sig;
+"dmd.conf"
+"dmd-doc.desktop")
 sha256sums=('SKIP'
 'SKIP'
 'SKIP'
-'3d639e89528fed1da90006f4dfb2b0fdc41308da5a96d953381ff4ccf257c035')
+'3e3fc9fbdc61681edea837e9d095a341dda6c325ab4dbc437017239d576ba433'
+'SKIP'
+'3d639e89528fed1da90006f4dfb2b0fdc41308da5a96d953381ff4ccf257c035'
+'19c9cd3670bdef7fbde88de36c459d940e6b7bacc2a5e48aefbfd1b2c1895e07')
+validpgpkeys=('AFC7DB45693D62BB472BF27BAB8FE924C2F7E724') # Martin Nowak 

+noextract=("dmd.$pkgver.linux.tar.xz")
 
+prepare() {
+# We only want to extract the docs & samples, not the prebuild executables
+tar xfJ "dmd.$pkgver.linux.tar.xz" dmd2/html
+}
+
 build() {
-cd dmd/src
+cd "$srcdir"/dmd
 make -f posix.mak RELEASE=1 PIC=1
 
 cd "$srcdir"/druntime
@@ -44,6 +57,7 @@
 optdepends=(
 'dtools: collection of useful utilities for development in D'
 'gcc-multilib: to cross-compile 32-bit applications'
+'dmd-docs: documentation and sample code for D'
 )
 provides=("d-compiler=$pkgver")
 license=('custom')
@@ -60,11 +74,26 @@
 
 install -Dm644 dmd/LICENSE.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
+find "$pkgdir"/usr -type f | xargs chmod 0644
+chmod 755 "$pkgdir"/usr/bin/*
+}
+
+package_dmd-doc() {
+pkgdesc="Documentation and sample code for D programming language"
+depends=('dmd')
+   arch=('any')
+license=('custom')
+
+mkdir -p "$pkgdir"/usr/share/applications
+install -Dm644 dmd-doc.desktop 
"$pkgdir"/usr/share/applications/dmd-doc.desktop
+
 mkdir -p "$pkgdir"/usr/share/d/samples/
 cp -r dmd/samples/* "$pkgdir"/usr/share/d/samples/
 
-find "$pkgdir"/usr -type f | xargs chmod 0644
-chmod 755 "$pkgdir"/usr/bin/*
+mkdir -p "$pkgdir"/usr/share/d/html
+cp -r dmd2/html/* "$pkgdir"/usr/share/d/html/
+
+install -Dm644 dmd/LICENSE.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_libphobos() {

Added: dmd-doc.desktop
===
--- dmd-doc.desktop (rev 0)
+++ dmd-doc.desktop 2017-09-08 23:38:12 UTC (rev 256455)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=dmd/phobos documentation
+Comment=dmd compiler and phobos library documentation
+Exec=xdg-open /usr/share/d/html/d/language-reference.html
+Icon=dmd-doc
+Categories=Development;