[arch-commits] Commit in fltk/trunk (PKGBUILD)

2020-10-02 Thread David Runge via arch-commits 
Date: Friday, October 2, 2020 @ 19:15:09
  Author: dvzrv
Revision: 715528

upgpkg: fltk 1.3.5-4: Rebuild to include libxcursor and libxinerama (FS#67916).

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-02 19:14:35 UTC (rev 715527)
+++ PKGBUILD2020-10-02 19:15:09 UTC (rev 715528)
@@ -3,13 +3,14 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-examples')
 pkgver=1.3.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Graphical user interface toolkit for X"
 arch=('x86_64')
 license=('custom' 'LGPL')
 url="https://www.fltk.org/;
-makedepends=('alsa-lib' 'cmake' 'doxygen' 'libglvnd' 'libjpeg' 'libpng' 'mesa'
-'libx11' 'libxft')
+makedepends=('alsa-lib' 'cmake' 'doxygen' 'fontconfig' 'libglvnd'
+'libjpeg-turbo' 'libpng' 'mesa' 'libx11' 'libxcursor' 'libxfixes' 'libxft'
+'libxinerama' 'libxrender')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgbase}/${pkgbase}/archive/release-${pkgver}.tar.gz;
 "${pkgname}-fix-lib-mess.patch")
 
sha512sums=('35732df4d66573fdabf95f57069c5a2df63b0029d7b904d4ac02bd4c3ab3e5b287d4f06998b67129e8195c42c0b39e137e5d4f10baf4d73992077bb5ae0bef6c'
@@ -50,8 +51,9 @@
 
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
-  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libglvnd' 'libjpeg'
-  'libpng' 'libx11' 'libxext' 'libxfixes' 'libxft')
+  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libfontconfig.so'
+  'libglvnd' 'libjpeg-turbo' 'libpng' 'libx11' 'libxcursor' 'libxext'
+  'libxfixes' 'libxft' 'libxinerama' 'libxrender')
   provides=('libfltk_images.so' 'libfltk_gl.so' 'libfltk_forms.so' 
'libfltk.so')
   options=('!docs' 'staticlibs')
   cd "${pkgbase}-${pkgver}"
@@ -70,8 +72,9 @@
 
 package_fltk-examples() {
   pkgdesc="Graphical user interface toolkit for X (examples)"
-  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libasound.so' 'libjpeg'
-  'libpng' 'libx11' 'libxext' 'libxfixes' 'libxft')
+  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libasound.so'
+  'libfontconfig.so' 'libjpeg-turbo' 'libpng' 'libx11' 'libxcursor' 'libxext'
+  'libxfixes' 'libxft' 'libxinerama' 'libxrender')
   options=('!docs')
   cd "${pkgbase}-${pkgver}"
   make DESTDIR="$pkgdir" install -C build-examples

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2020-07-17 Thread David Runge via arch-commits 
Date: Friday, July 17, 2020 @ 15:45:20
  Author: dvzrv
Revision: 664289

upgpkg: fltk 1.3.5-3: Rebuilding with libxft.

Rebuilding with libxft (which was previously pulled in by cairo).
This (most likely) fixes issues as seen in FS#67089.

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-17 15:08:22 UTC (rev 664288)
+++ PKGBUILD2020-07-17 15:45:20 UTC (rev 664289)
@@ -3,13 +3,13 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-examples')
 pkgver=1.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Graphical user interface toolkit for X"
 arch=('x86_64')
 license=('custom' 'LGPL')
 url="https://www.fltk.org/;
 makedepends=('alsa-lib' 'cmake' 'doxygen' 'libglvnd' 'libjpeg' 'libpng' 'mesa'
-'libx11')
+'libx11' 'libxft')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgbase}/${pkgbase}/archive/release-${pkgver}.tar.gz;
 "${pkgname}-fix-lib-mess.patch")
 
sha512sums=('35732df4d66573fdabf95f57069c5a2df63b0029d7b904d4ac02bd4c3ab3e5b287d4f06998b67129e8195c42c0b39e137e5d4f10baf4d73992077bb5ae0bef6c'
@@ -51,7 +51,7 @@
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
   depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libglvnd' 'libjpeg'
-  'libpng' 'libx11' 'libxext' 'libxfixes')
+  'libpng' 'libx11' 'libxext' 'libxfixes' 'libxft')
   provides=('libfltk_images.so' 'libfltk_gl.so' 'libfltk_forms.so' 
'libfltk.so')
   options=('!docs' 'staticlibs')
   cd "${pkgbase}-${pkgver}"
@@ -71,7 +71,7 @@
 package_fltk-examples() {
   pkgdesc="Graphical user interface toolkit for X (examples)"
   depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libasound.so' 'libjpeg'
-  'libpng' 'libx11' 'libxext' 'libxfixes')
+  'libpng' 'libx11' 'libxext' 'libxfixes' 'libxft')
   options=('!docs')
   cd "${pkgbase}-${pkgver}"
   make DESTDIR="$pkgdir" install -C build-examples

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2020-06-20 Thread David Runge via arch-commits 
Date: Saturday, June 20, 2020 @ 19:02:52
  Author: dvzrv
Revision: 648652

upgpkg: fltk 1.3.5-2: Splitting out examples.

Updating makedepends to only include really required packages.
Applying latest cmake packaging guidelines.
Adding all soprovides for fltk.
Splitting out examples (games) into fltk-examples.
Cleaning up duplicates in fltk/fltk-examples.
Updating maintainer info.

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |   95 +++--
 1 file changed, 62 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-20 17:09:50 UTC (rev 648651)
+++ PKGBUILD2020-06-20 19:02:52 UTC (rev 648652)
@@ -1,16 +1,16 @@
-# Maintainer: David Runge 
+# Maintainer: David Runge 
 
 pkgbase=fltk
-pkgname=('fltk' 'fltk-docs')
+pkgname=('fltk' 'fltk-docs' 'fltk-examples')
 pkgver=1.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphical user interface toolkit for X"
 arch=('x86_64')
 license=('custom' 'LGPL')
 url="https://www.fltk.org/;
-makedepends=('alsa-lib' 'cairo' 'cmake' 'desktop-file-utils' 'doxygen' 'glu' 
'libjpeg'
-'libxcursor' 'libxft' 'libxinerama' 'mesa' 'shared-mime-info')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/fltk/fltk/archive/release-${pkgver}.tar.gz;
+makedepends=('alsa-lib' 'cmake' 'doxygen' 'libglvnd' 'libjpeg' 'libpng' 'mesa'
+'libx11')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgbase}/${pkgbase}/archive/release-${pkgver}.tar.gz;
 "${pkgname}-fix-lib-mess.patch")
 
sha512sums=('35732df4d66573fdabf95f57069c5a2df63b0029d7b904d4ac02bd4c3ab3e5b287d4f06998b67129e8195c42c0b39e137e5d4f10baf4d73992077bb5ae0bef6c'
 
'14592ba5616483df1b36f6e2b8309a3d1e898c5c4dcf0ddfbb374bbd1332eca6ba3490569fc8f903023a069b7771ed06baddef36140253e2e81eb409892bbba5')
@@ -21,50 +21,79 @@
   # fix bizarre renaming of shared libraries
   # https://github.com/fltk/fltk/issues/20
   patch -Np1 -i ../${pkgname}-fix-lib-mess.patch
-  mkdir -v build
 }
 
 build() {
-  cd "${pkgbase}-${pkgver}/build"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DFLTK_LIBDIR=/usr/lib \
+  cd "${pkgbase}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX='/usr' \
+-DFLTK_LIBDIR='/usr/lib' \
+-DCMAKE_BUILD_TYPE='None' \
 -DOPTION_CREATE_LINKS=ON \
+-DOPTION_BUILD_EXAMPLES=OFF \
 -DOPTION_BUILD_SHARED_LIBS=ON \
 -DOPTION_BUILD_HTML_DOCUMENTATION=ON \
 -DOPTION_INSTALL_HTML_DOCUMENTATION=ON \
-..
-  make VERBOSE=1
-  make -C documentation html
+-Wno-dev \
+-B build \
+-S .
+  make VERBOSE=1 -C build
+  make -C build/documentation html
+  cmake -DCMAKE_INSTALL_PREFIX='/usr' \
+-DFLTK_LIBDIR='/usr/lib' \
+-DCMAKE_BUILD_TYPE='None' \
+-DOPTION_BUILD_EXAMPLES=ON \
+-Wno-dev \
+-B build-examples \
+-S .
+  make VERBOSE=1 -C build-examples
 }
 
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
-  depends=('cairo' 'desktop-file-utils' 'glu' 'hicolor-icon-theme' 'libjpeg'
-  'libxcursor' 'libxft' 'libxinerama' 'shared-mime-info' 'xdg-utils')
-  optdepends=('alsa-lib: for sudoku example application')
-  replaces=('fltk-games')
+  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libglvnd' 'libjpeg'
+  'libpng' 'libx11' 'libxext' 'libxfixes')
+  provides=('libfltk_images.so' 'libfltk_gl.so' 'libfltk_forms.so' 
'libfltk.so')
   options=('!docs' 'staticlibs')
+  cd "${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}/" install -C build
+  install -vDm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  # removing man pages of examples
+  rm -rvf "${pkgdir}/usr/share/man/man6"
+}
 
-  cd "${pkgbase}-${pkgver}/build"
-  make DESTDIR="${pkgdir}/" install
-  install -vDm 644 ../COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+package_fltk-docs() {
+  pkgdesc="Graphical user interface toolkit for X (documentation)"
+  cd "${pkgbase}-${pkgver}"
+  make DESTDIR="$pkgdir" install -C build/documentation html
+  install -vDm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
+
+package_fltk-examples() {
+  pkgdesc="Graphical user interface toolkit for X (examples)"
+  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libasound.so' 'libjpeg'
+  'libpng' 'libx11' 'libxext' 'libxfixes')
+  options=('!docs')
+  cd "${pkgbase}-${pkgver}"
+  make DESTDIR="$pkgdir" install -C build-examples
   # example apps and integration files, that are not covered by make install
   for app in {blocks,checkers,sudoku}; do
-install -vDm 755 "bin/examples/$app" -t "${pkgdir}/usr/bin/"
-install -vDm 644 "../test/desktop/$app.desktop" \
+install -vDm 755 "build-examples/bin/examples/$app" -t "${pkgdir}/usr/bin/"
+install -vDm 644 "test/desktop/$app.desktop" \
   -t "${pkgdir}/usr/share/applications/"
-install -vDm 644 "../test/desktop/$app-32.png" \
+install -vDm 644 "test/desktop/$app-32.png" \

[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-libpng.patch fltk-pkgconf.patch)

2018-07-18 Thread David Runge via arch-commits 
Date: Wednesday, July 18, 2018 @ 20:41:57
  Author: dvzrv
Revision: 362312

upgpkg: fltk 1.3.4.2-3

Adding patches for libpng headers and freetype-config deprecation through 
pkgconf. Minor fixes for readability.

Added:
  fltk/trunk/fltk-libpng.patch
  fltk/trunk/fltk-pkgconf.patch
Modified:
  fltk/trunk/PKGBUILD

+
 PKGBUILD   |   53 +++
 fltk-libpng.patch  |   11 ++
 fltk-pkgconf.patch |   19 ++
 3 files changed, 63 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-18 20:16:28 UTC (rev 362311)
+++ PKGBUILD2018-07-18 20:41:57 UTC (rev 362312)
@@ -5,33 +5,46 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=3
+pkgdesc="Graphical user interface toolkit for X"
 arch=('x86_64')
-license=('custom:LGPL')
+license=('custom' 'LGPL')
 url="http://www.fltk.org/;
-makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama'
- 'alsa-lib' 'desktop-file-utils' 'libxcursor')
+makedepends=('alsa-lib' 'desktop-file-utils' 'doxygen' 'glu' 'libjpeg'
+'libxcursor' 'libxft' 'libxinerama' 'mesa')
 
source=("http://fltk.org/pub/${pkgbase}/${_pkgver%"-2"}/${pkgbase}-${_pkgver}-source.tar.gz;
-fltk-config-dynlibs.patch)
+"${pkgbase}-config-dynlibs.patch"
+"${pkgbase}-libpng.patch"
+"${pkgbase}-pkgconf.patch")
 
sha512sums=('cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d'
-
'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5')
+
'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5'
+
'e8e9b79936a09c333ce915a6215753878b6ac8a9800fd2b042e420c266ed1a05fa804eeb70a4fac6ee62ae94e2f24a7a08c4eea0767344524870d558ca1ffc02'
+
'68c42be32141de7a3014b3f4f180b80feae02af33a5345e9cd942b9887037f34f08cc74b7a771f66db668613638650c6153c8a7b2471158bec6ec203af35')
 
 prepare() {
   cd "${pkgbase}-${_pkgver}"
   # Fix broken removal of static linking: https://bugs.archlinux.org/task/38276
-  patch -p1 -i ../fltk-config-dynlibs.patch
-  sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' 
FL/x.H
-  sed -i 's/x-fluid.desktop/fluid.desktop/' -i fluid/Makefile
-  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
- -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
+  patch -p1 -i "../${pkgbase}-config-dynlibs.patch"
+  # Fix search for header of libpng
+  patch -p1 -i "../${pkgbase}-libpng.patch"
+  # Fix dead call to freetype-config by replacing it with call to pkgconf
+  patch -p1 -i "../${pkgbase}-pkgconf.patch"
+  sed -e 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' \
+  -i FL/x.H
+  sed -e 's/x-fluid.desktop/fluid.desktop/' \
+  -i fluid/Makefile
+  sed -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
+  -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' \
+  -i test/Makefile
+  ./autogen.sh
 }
 
 build() {
   cd "${pkgbase}-${_pkgver}"
   ./configure --prefix=/usr \
---enable-threads \
---enable-xft \
---enable-shared
+  --enable-threads \
+  --enable-xft \
+  --enable-shared
   make
   make -C documentation html
 }
@@ -38,14 +51,14 @@
 
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
-  depends=('libjpeg' 'libxft' 'libxinerama' 'hicolor-icon-theme'
-   'desktop-file-utils' 'xdg-utils' 'libxcursor' 'glu')
+  depends=('libjpeg' 'libxcursor' 'libxft' 'libxinerama'
+   'desktop-file-utils' 'glu' 'hicolor-icon-theme' 'xdg-utils')
   options=('!docs')
 
   cd "${pkgbase}-${_pkgver}"
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C fluid install install-linux
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -vDm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-docs() {
@@ -52,9 +65,9 @@
   pkgdesc="Graphical user interface toolkit for X (documentation)"
 
   cd "${pkgbase}-${_pkgver}/documentation"
-  install -t "${pkgdir}/usr/share/doc/fltk/" -Dm644 html/*
   make DESTDIR="$pkgdir" -C ../test install
-  install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -vDm 644 html/* -t "${pkgdir}/usr/share/doc/fltk/"
+  install -vDm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-games() {
@@ -64,5 +77,5 @@
   cd "${pkgbase}-${_pkgver}/test"
   make DESTDIR="$pkgdir" install-linux
   make DESTDIR="$pkgdir" -C ../documentation install-linux
-  install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -vDm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Added:

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2018-01-25 Thread David Runge via arch-commits 
Date: Thursday, January 25, 2018 @ 13:32:21
  Author: dvzrv
Revision: 286807

upgpkg: fltk 1.3.4.2-2

Adding relevant link to bug regarding patch.

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-25 13:29:25 UTC (rev 286806)
+++ PKGBUILD2018-01-25 13:32:21 UTC (rev 286807)
@@ -5,7 +5,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/;
@@ -18,6 +18,7 @@
 
 prepare() {
   cd "${pkgbase}-${_pkgver}"
+  # Fix broken removal of static linking: https://bugs.archlinux.org/task/38276
   patch -p1 -i ../fltk-config-dynlibs.patch
   sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' 
FL/x.H
   sed -i 's/x-fluid.desktop/fluid.desktop/' -i fluid/Makefile

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2018-01-25 Thread David Runge via arch-commits 
Date: Thursday, January 25, 2018 @ 12:33:39
  Author: dvzrv
Revision: 286802

upgpkg: fltk 1.3.4.2-1

Updating to 1.3.4-2 (which translates to 1.3.4.2).

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-25 12:24:26 UTC (rev 286801)
+++ PKGBUILD2018-01-25 12:33:39 UTC (rev 286802)
@@ -1,22 +1,23 @@
 # $Id$
 # Maintainer: David Runge 
 
+_pkgver=1.3.4-2
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.4
-pkgrel=2
+pkgver=${_pkgver//-/.}
+pkgrel=1
 arch=('x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/;
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama'
  'alsa-lib' 'desktop-file-utils' 'libxcursor')
-source=("http://fltk.org/pub/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}-source.tar.gz;
+source=("http://fltk.org/pub/${pkgbase}/${_pkgver%"-2"}/${pkgbase}-${_pkgver}-source.tar.gz;
 fltk-config-dynlibs.patch)
-sha512sums=('92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2'
+sha512sums=('cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d'
 
'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5')
 
 prepare() {
-  cd "${pkgbase}-${pkgver}"
+  cd "${pkgbase}-${_pkgver}"
   patch -p1 -i ../fltk-config-dynlibs.patch
   sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' 
FL/x.H
   sed -i 's/x-fluid.desktop/fluid.desktop/' -i fluid/Makefile
@@ -25,7 +26,7 @@
 }
 
 build() {
-  cd "${pkgbase}-${pkgver}"
+  cd "${pkgbase}-${_pkgver}"
   ./configure --prefix=/usr \
 --enable-threads \
 --enable-xft \
@@ -40,7 +41,7 @@
'desktop-file-utils' 'xdg-utils' 'libxcursor' 'glu')
   options=('!docs')
 
-  cd "${pkgbase}-${pkgver}"
+  cd "${pkgbase}-${_pkgver}"
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C fluid install install-linux
   install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -49,7 +50,7 @@
 package_fltk-docs() {
   pkgdesc="Graphical user interface toolkit for X (documentation)"
 
-  cd "${pkgbase}-${pkgver}/documentation"
+  cd "${pkgbase}-${_pkgver}/documentation"
   install -t "${pkgdir}/usr/share/doc/fltk/" -Dm644 html/*
   make DESTDIR="$pkgdir" -C ../test install
   install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -59,7 +60,7 @@
   pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
   depends=('alsa-lib' 'fltk')
 
-  cd "${pkgbase}-${pkgver}/test"
+  cd "${pkgbase}-${_pkgver}/test"
   make DESTDIR="$pkgdir" install-linux
   make DESTDIR="$pkgdir" -C ../documentation install-linux
   install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2018-01-03 Thread David Runge via arch-commits 
Date: Wednesday, January 3, 2018 @ 11:08:24
  Author: dvzrv
Revision: 278211

upgpkg: fltk 1.3.4-2

Adding maintainer. Switching to sha512sums. Moving all fixes to prepare().
Streamlining installation of doc files. Minor fixes.

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |   40 
 1 file changed, 20 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-03 10:59:44 UTC (rev 278210)
+++ PKGBUILD2018-01-03 11:08:24 UTC (rev 278211)
@@ -1,32 +1,35 @@
 # $Id$
-# Maintainer:
+# Maintainer: David Runge 
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/;
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama'
  'alsa-lib' 'desktop-file-utils' 'libxcursor')
-source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
+source=("http://fltk.org/pub/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}-source.tar.gz;
 fltk-config-dynlibs.patch)
-md5sums=('c0e43ac259ac8c5d0f7634566e21e3f8'
- '401c6df25c78f766e6dff26a13806eb2')
+sha512sums=('92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2'
+
'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5')
 
 prepare() {
-  cd $pkgbase-$pkgver
+  cd "${pkgbase}-${pkgver}"
   patch -p1 -i ../fltk-config-dynlibs.patch
   sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' 
FL/x.H
   sed -i 's/x-fluid.desktop/fluid.desktop/' -i fluid/Makefile
+  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
+ -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
 }
 
 build() {
-  cd $pkgbase-$pkgver
-  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
- -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
-  ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
+  cd "${pkgbase}-${pkgver}"
+  ./configure --prefix=/usr \
+--enable-threads \
+--enable-xft \
+--enable-shared
   make
   make -C documentation html
 }
@@ -37,22 +40,19 @@
'desktop-file-utils' 'xdg-utils' 'libxcursor' 'glu')
   options=('!docs')
 
-  cd $pkgbase-$pkgver
+  cd "${pkgbase}-${pkgver}"
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C fluid install install-linux
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-docs() {
   pkgdesc="Graphical user interface toolkit for X (documentation)"
 
-  cd $pkgbase-$pkgver/documentation
-  install -d "$pkgdir"/usr/share/doc/fltk/
-  for _file in html/* ; do
-install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
-  done
+  cd "${pkgbase}-${pkgver}/documentation"
+  install -t "${pkgdir}/usr/share/doc/fltk/" -Dm644 html/*
   make DESTDIR="$pkgdir" -C ../test install
-  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-games() {
@@ -59,8 +59,8 @@
   pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
   depends=('alsa-lib' 'fltk')
 
-  cd $pkgbase-$pkgver/test
+  cd "${pkgbase}-${pkgver}/test"
   make DESTDIR="$pkgdir" install-linux
   make DESTDIR="$pkgdir" -C ../documentation install-linux
-  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

[arch-commits] Commit in fltk/trunk (PKGBUILD tigervnc.patch)

2016-11-13 Thread Antonio Rojas 
Date: Sunday, November 13, 2016 @ 21:46:41
  Author: arojas
Revision: 280626

Update to 1.3.4

Modified:
  fltk/trunk/PKGBUILD
Deleted:
  fltk/trunk/tigervnc.patch

+
 PKGBUILD   |   11 +-
 tigervnc.patch |  226 ---
 2 files changed, 5 insertions(+), 232 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-13 20:14:15 UTC (rev 280625)
+++ PKGBUILD2016-11-13 21:46:41 UTC (rev 280626)
@@ -3,8 +3,8 @@
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.3
-pkgrel=6
+pkgver=1.3.4
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/;
@@ -11,16 +11,15 @@
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama'
  'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
-tigervnc.patch fltk-config-dynlibs.patch)
-md5sums=('9ccdb0d19dc104b87179bd9fd10822e3'
- '45bb8f6be2b92710c8f21c1f91fad7d2'
+fltk-config-dynlibs.patch)
+md5sums=('c0e43ac259ac8c5d0f7634566e21e3f8'
  '401c6df25c78f766e6dff26a13806eb2')
 
 prepare() {
   cd $pkgbase-$pkgver
-  patch -p1 -i ../tigervnc.patch
   patch -p1 -i ../fltk-config-dynlibs.patch
   sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' 
FL/x.H
+  sed -i 's/x-fluid.desktop/fluid.desktop/' -i fluid/Makefile
 }
 
 build() {

Deleted: tigervnc.patch
===
--- tigervnc.patch  2016-11-13 20:14:15 UTC (rev 280625)
+++ tigervnc.patch  2016-11-13 21:46:41 UTC (rev 280626)
@@ -1,226 +0,0 @@
-diff -Nur fltk-1.3.2.orig/FL/Enumerations.H fltk-1.3.2/FL/Enumerations.H
 fltk-1.3.2.orig/FL/Enumerations.H  2012-12-09 19:45:57.0 +0100
-+++ fltk-1.3.2/FL/Enumerations.H   2013-07-17 19:37:45.785342886 +0200
-@@ -909,27 +909,27 @@
- /* FIXME: We should renumber these, but that will break the ABI */
- enum Fl_Cursor {
-   FL_CURSOR_DEFAULT=  0, /**< the default cursor, usually an arrow. */
--  FL_CURSOR_ARROW  = 35, /**< an arrow pointer. */
--  FL_CURSOR_CROSS  = 66, /**< crosshair. */
--  FL_CURSOR_WAIT   = 76, /**< busy indicator (e.g. hourglass). */
--  FL_CURSOR_INSERT = 77, /**< I-beam. */
--  FL_CURSOR_HAND   = 31, /**< pointing hand. */
--  FL_CURSOR_HELP   = 47, /**< question mark pointer. */
--  FL_CURSOR_MOVE   = 27, /**< 4-pointed arrow or hand. */
-+  FL_CURSOR_ARROW  = 1, /**< an arrow pointer. */
-+  FL_CURSOR_CROSS  = 2, /**< crosshair. */
-+  FL_CURSOR_WAIT   = 3, /**< busy indicator (e.g. hourglass). */
-+  FL_CURSOR_INSERT = 4, /**< I-beam. */
-+  FL_CURSOR_HAND   = 5, /**< pointing hand. */
-+  FL_CURSOR_HELP   = 6, /**< question mark pointer. */
-+  FL_CURSOR_MOVE   = 7, /**< 4-pointed arrow or hand. */
- 
-   /* Resize indicators */
--  FL_CURSOR_NS = 78, /**< up/down resize. */
--  FL_CURSOR_WE = 79, /**< left/right resize. */
--  FL_CURSOR_NWSE   = 80, /**< diagonal resize. */
--  FL_CURSOR_NESW   = 81, /**< diagonal resize. */
--  FL_CURSOR_N  = 70, /**< upwards resize. */
--  FL_CURSOR_NE = 69, /**< upwards, right resize. */
--  FL_CURSOR_E  = 49, /**< rightwards resize. */
--  FL_CURSOR_SE =  8, /**< downwards, right resize. */
--  FL_CURSOR_S  =  9, /**< downwards resize. */
--  FL_CURSOR_SW =  7, /**< downwards, left resize. */
--  FL_CURSOR_W  = 36, /**< leftwards resize. */
--  FL_CURSOR_NW = 68, /**< upwards, left resize. */
-+  FL_CURSOR_NS = 101, /**< up/down resize. */
-+  FL_CURSOR_WE = 102, /**< left/right resize. */
-+  FL_CURSOR_NWSE   = 103, /**< diagonal resize. */
-+  FL_CURSOR_NESW   = 104, /**< diagonal resize. */
-+  FL_CURSOR_NE = 110, /**< upwards, right resize. */
-+  FL_CURSOR_N  = 111, /**< upwards resize. */
-+  FL_CURSOR_NW = 112, /**< upwards, left resize. */
-+  FL_CURSOR_E  = 113, /**< rightwards resize. */
-+  FL_CURSOR_W  = 114, /**< leftwards resize. */
-+  FL_CURSOR_SE = 115, /**< downwards, right resize. */
-+  FL_CURSOR_S  = 116, /**< downwards resize. */
-+  FL_CURSOR_SW = 117, /**< downwards, left resize. */
- 
-   FL_CURSOR_NONE   =255  /**< invisible. */
- };
-diff -Nur fltk-1.3.2.orig/FL/Fl_Widget.H fltk-1.3.2/FL/Fl_Widget.H
 fltk-1.3.2.orig/FL/Fl_Widget.H 2012-04-23 22:12:06.0 +0200
-+++ fltk-1.3.2/FL/Fl_Widget.H  2013-07-17 19:37:07.411344886 +0200
-@@ -172,6 +172,7 @@
- COPIED_TOOLTIP  = 1<<17,  ///< the widget tooltip is internally 
copied, its destruction is handled by the widget
- FULLSCREEN  = 1<<18,  ///< a fullscreen window (Fl_Window)
- MAC_USE_ACCENTS_MENU = 1<<19, ///< On the Mac OS platform, pressing 
and holding a key on the

[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-games.install fltk.install)

2016-04-27 Thread Felix Yan 
Date: Wednesday, April 27, 2016 @ 18:37:58
  Author: fyan
Revision: 266261

upgpkg: fltk 1.3.3-6

Hooks rebuild (part 1)

Modified:
  fltk/trunk/PKGBUILD
Deleted:
  fltk/trunk/fltk-games.install
  fltk/trunk/fltk.install

+
 PKGBUILD   |4 +---
 fltk-games.install |   11 ---
 fltk.install   |   12 
 3 files changed, 1 insertion(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 16:37:02 UTC (rev 266260)
+++ PKGBUILD2016-04-27 16:37:58 UTC (rev 266261)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.3
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/;
@@ -37,7 +37,6 @@
   depends=('libjpeg' 'libxft' 'libxinerama' 'hicolor-icon-theme'
'desktop-file-utils' 'xdg-utils' 'libxcursor' 'glu')
   options=('!docs')
-  install=fltk.install
 
   cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
@@ -60,7 +59,6 @@
 package_fltk-games() {
   pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
   depends=('alsa-lib' 'fltk')
-  install=fltk-games.install
 
   cd $pkgbase-$pkgver/test
   make DESTDIR="$pkgdir" install-linux

Deleted: fltk-games.install
===
--- fltk-games.install  2016-04-27 16:37:02 UTC (rev 266260)
+++ fltk-games.install  2016-04-27 16:37:58 UTC (rev 266261)
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install 
-}

Deleted: fltk.install
===
--- fltk.install2016-04-27 16:37:02 UTC (rev 266260)
+++ fltk.install2016-04-27 16:37:58 UTC (rev 266261)
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install 
-}

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras 
Date: Sunday, December 6, 2015 @ 20:21:40
  Author: foutrelis
Revision: 252964

C++11 ABI rebuild

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 19:21:17 UTC (rev 252963)
+++ PKGBUILD2015-12-06 19:21:40 UTC (rev 252964)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.3
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/;

[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-config-dynlibs.patch)

2014-12-31 Thread Eric Bélanger 
Date: Wednesday, December 31, 2014 @ 22:12:25
  Author: eric
Revision: 228266

upgpkg: fltk 1.3.3-4

Remove reference to static libs in fltk-config (close FS#43106)

Modified:
  fltk/trunk/PKGBUILD
  fltk/trunk/fltk-config-dynlibs.patch

---+
 PKGBUILD  |4 +-
 fltk-config-dynlibs.patch |   68 +---
 2 files changed, 66 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-31 20:27:10 UTC (rev 228265)
+++ PKGBUILD2014-12-31 21:12:25 UTC (rev 228266)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.3
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
@@ -14,7 +14,7 @@
 tigervnc.patch fltk-config-dynlibs.patch)
 md5sums=('9ccdb0d19dc104b87179bd9fd10822e3'
  '45bb8f6be2b92710c8f21c1f91fad7d2'
- 'b7ca1a3f5055aabe9c823e650db5b0b0')
+ '401c6df25c78f766e6dff26a13806eb2')
 
 prepare() {
   cd $pkgbase-$pkgver

Modified: fltk-config-dynlibs.patch
===
--- fltk-config-dynlibs.patch   2014-12-31 20:27:10 UTC (rev 228265)
+++ fltk-config-dynlibs.patch   2014-12-31 21:12:25 UTC (rev 228266)
@@ -1,9 +1,69 @@
-diff -rupN a/fltk-config.in b/fltk-config.in
 a/fltk-config.in   2011-07-19 06:49:30.0 +0200
-+++ b/fltk-config.in   2013-12-26 07:50:58.393155344 +0100
-@@ -357,26 +357,26 @@ if test $echo_ldstaticflags = yes; t
+diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
+--- fltk-1.3.3-orig/fltk-config.in 2014-12-31 15:43:07.203519633 -0500
 fltk-1.3.3/fltk-config.in  2014-12-31 15:49:01.636277725 -0500
+@@ -54,21 +54,6 @@
+   bindir=$selfdir/fluid
+   includedir=$selfdir
+   libdir=$selfdir/lib
+-
+-  if test -f $libdir/libfltk_jpeg.a; then
+-  CFLAGS=-I$includedir/jpeg $CFLAGS
+-  CXXFLAGS=-I$includedir/jpeg $CXXFLAGS
+-  fi
+-
+-  if test -f $libdir/libfltk_z.a; then
+-  CFLAGS=-I$includedir/zlib $CFLAGS
+-  CXXFLAGS=-I$includedir/zlib $CXXFLAGS
+-  fi
+-
+-  if test -f $libdir/libfltk_png.a; then
+-  CFLAGS=-I$includedir/png $CFLAGS
+-  CXXFLAGS=-I$includedir/png $CXXFLAGS
+-  fi
  fi
  
+ if test -d $includedir/FL/images; then
+@@ -76,11 +61,6 @@
+   CXXFLAGS=-I$includedir/FL/images $CXXFLAGS
+ fi
+ 
+-if test -f $libdir/libfltk_cairo.a; then
+-  CFLAGS=$CAIROFLAGS $CFLAGS
+-  CXXFLAGS=$CAIROFLAGS $CXXFLAGS
+-fi
+-
+ # libraries to link with:
+ LIBNAME=@LIBNAME@
+ DSONAME=@DSONAME@
+@@ -230,25 +210,20 @@
+ fi
+ 
+ # Calculate needed libraries
+-LDSTATIC=$libdir/libfltk.a $LDLIBS
+ LDLIBS=-lfltk$SHAREDSUFFIX $LDLIBS
+ 
+ if test x$use_forms = xyes; then
+ LDLIBS=-lfltk_forms$SHAREDSUFFIX $LDLIBS
+-LDSTATIC=$libdir/libfltk_forms.a $LDSTATIC
+ fi
+ if test x$use_gl = xyes; then
+ LDLIBS=-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS
+-LDSTATIC=$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC
+ fi
+ if test x$use_images = xyes; then
+ LDLIBS=-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS
+-LDSTATIC=$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC
+ fi
+ 
+ if test x$use_cairo = xyes; then
+ LDLIBS=-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS
+-LDSTATIC=$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC
+ fi
+ 
+ LDLIBS=$DSOLINK $LDFLAGS $libs $LDLIBS
+@@ -359,26 +334,26 @@
+ fi
+ 
  if test $echo_libs = yes; then
 -USELIBS=$libdir/libfltk.a
 +USELIBS=$libdir/libfltk.so

[arch-commits] Commit in fltk/trunk (PKGBUILD tigervnc.patch)

2014-11-18 Thread Eric Bélanger 
Date: Wednesday, November 19, 2014 @ 01:46:56
  Author: eric
Revision: 226375

upgpkg: fltk 1.3.3-3

Add another tigervnc fix

Modified:
  fltk/trunk/PKGBUILD
  fltk/trunk/tigervnc.patch

+
 PKGBUILD   |4 ++--
 tigervnc.patch |   10 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-19 00:42:38 UTC (rev 226374)
+++ PKGBUILD2014-11-19 00:46:56 UTC (rev 226375)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
@@ -13,7 +13,7 @@
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
 tigervnc.patch fltk-config-dynlibs.patch)
 md5sums=('9ccdb0d19dc104b87179bd9fd10822e3'
- 'b55459e097bec047b6b682ab6d8fac7f'
+ '45bb8f6be2b92710c8f21c1f91fad7d2'
  'b7ca1a3f5055aabe9c823e650db5b0b0')
 
 prepare() {

Modified: tigervnc.patch
===
--- tigervnc.patch  2014-11-19 00:42:38 UTC (rev 226374)
+++ tigervnc.patch  2014-11-19 00:46:56 UTC (rev 226375)
@@ -214,3 +214,13 @@
  void fl_open_display() {
if (fl_display) return;
  
+--- fltk-1.3.2.orig/src/Fl_x.cxx(revision 10433)
 fltk-1.3.2/src/Fl_x.cxx(revision 10434)
+@@ -2211,6 +2211,7 @@
+   static int result = -1;
+ 
+   if (result == -1) {
++fl_open_display();
+ result = 0;
+ unsigned long nitems;
+ unsigned long *words = 0;

[arch-commits] Commit in fltk/trunk (PKGBUILD tigervnc.patch)

2014-11-17 Thread Eric Bélanger 
Date: Tuesday, November 18, 2014 @ 04:15:59
  Author: eric
Revision: 226356

upgpkg: fltk 1.3.3-2

Readd tigervnc patch (close FS#42795)

Added:
  fltk/trunk/tigervnc.patch
Modified:
  fltk/trunk/PKGBUILD

+
 PKGBUILD   |6 +
 tigervnc.patch |  216 +++
 2 files changed, 220 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-18 00:41:54 UTC (rev 226355)
+++ PKGBUILD2014-11-18 03:15:59 UTC (rev 226356)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
@@ -11,12 +11,14 @@
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama'
  'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
- fltk-config-dynlibs.patch)
+tigervnc.patch fltk-config-dynlibs.patch)
 md5sums=('9ccdb0d19dc104b87179bd9fd10822e3'
+ 'b55459e097bec047b6b682ab6d8fac7f'
  'b7ca1a3f5055aabe9c823e650db5b0b0')
 
 prepare() {
   cd $pkgbase-$pkgver
+  patch -p1 -i ../tigervnc.patch
   patch -p1 -i ../fltk-config-dynlibs.patch
   sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' 
FL/x.H
 }

Added: tigervnc.patch
===
--- tigervnc.patch  (rev 0)
+++ tigervnc.patch  2014-11-18 03:15:59 UTC (rev 226356)
@@ -0,0 +1,216 @@
+diff -Nur fltk-1.3.2.orig/FL/Enumerations.H fltk-1.3.2/FL/Enumerations.H
+--- fltk-1.3.2.orig/FL/Enumerations.H  2012-12-09 19:45:57.0 +0100
 fltk-1.3.2/FL/Enumerations.H   2013-07-17 19:37:45.785342886 +0200
+@@ -909,27 +909,27 @@
+ /* FIXME: We should renumber these, but that will break the ABI */
+ enum Fl_Cursor {
+   FL_CURSOR_DEFAULT=  0, /** the default cursor, usually an arrow. */
+-  FL_CURSOR_ARROW  = 35, /** an arrow pointer. */
+-  FL_CURSOR_CROSS  = 66, /** crosshair. */
+-  FL_CURSOR_WAIT   = 76, /** busy indicator (e.g. hourglass). */
+-  FL_CURSOR_INSERT = 77, /** I-beam. */
+-  FL_CURSOR_HAND   = 31, /** pointing hand. */
+-  FL_CURSOR_HELP   = 47, /** question mark pointer. */
+-  FL_CURSOR_MOVE   = 27, /** 4-pointed arrow or hand. */
++  FL_CURSOR_ARROW  = 1, /** an arrow pointer. */
++  FL_CURSOR_CROSS  = 2, /** crosshair. */
++  FL_CURSOR_WAIT   = 3, /** busy indicator (e.g. hourglass). */
++  FL_CURSOR_INSERT = 4, /** I-beam. */
++  FL_CURSOR_HAND   = 5, /** pointing hand. */
++  FL_CURSOR_HELP   = 6, /** question mark pointer. */
++  FL_CURSOR_MOVE   = 7, /** 4-pointed arrow or hand. */
+ 
+   /* Resize indicators */
+-  FL_CURSOR_NS = 78, /** up/down resize. */
+-  FL_CURSOR_WE = 79, /** left/right resize. */
+-  FL_CURSOR_NWSE   = 80, /** diagonal resize. */
+-  FL_CURSOR_NESW   = 81, /** diagonal resize. */
+-  FL_CURSOR_N  = 70, /** upwards resize. */
+-  FL_CURSOR_NE = 69, /** upwards, right resize. */
+-  FL_CURSOR_E  = 49, /** rightwards resize. */
+-  FL_CURSOR_SE =  8, /** downwards, right resize. */
+-  FL_CURSOR_S  =  9, /** downwards resize. */
+-  FL_CURSOR_SW =  7, /** downwards, left resize. */
+-  FL_CURSOR_W  = 36, /** leftwards resize. */
+-  FL_CURSOR_NW = 68, /** upwards, left resize. */
++  FL_CURSOR_NS = 101, /** up/down resize. */
++  FL_CURSOR_WE = 102, /** left/right resize. */
++  FL_CURSOR_NWSE   = 103, /** diagonal resize. */
++  FL_CURSOR_NESW   = 104, /** diagonal resize. */
++  FL_CURSOR_NE = 110, /** upwards, right resize. */
++  FL_CURSOR_N  = 111, /** upwards resize. */
++  FL_CURSOR_NW = 112, /** upwards, left resize. */
++  FL_CURSOR_E  = 113, /** rightwards resize. */
++  FL_CURSOR_W  = 114, /** leftwards resize. */
++  FL_CURSOR_SE = 115, /** downwards, right resize. */
++  FL_CURSOR_S  = 116, /** downwards resize. */
++  FL_CURSOR_SW = 117, /** downwards, left resize. */
+ 
+   FL_CURSOR_NONE   =255  /** invisible. */
+ };
+diff -Nur fltk-1.3.2.orig/FL/Fl_Widget.H fltk-1.3.2/FL/Fl_Widget.H
+--- fltk-1.3.2.orig/FL/Fl_Widget.H 2012-04-23 22:12:06.0 +0200
 fltk-1.3.2/FL/Fl_Widget.H  2013-07-17 19:37:07.411344886 +0200
+@@ -172,6 +172,7 @@
+ COPIED_TOOLTIP  = 117,  /// the widget tooltip is internally 
copied, its destruction is handled by the widget
+ FULLSCREEN  = 118,  /// a fullscreen window (Fl_Window)
+ MAC_USE_ACCENTS_MENU = 119, /// On the Mac OS platform, pressing 
and holding a key on the keyboard opens an accented-character menu window 
(Fl_Input_, Fl_Text_Editor)
++   SIMPLE_KEYBOARD = 120,  /// the widget wants simple, consistent

[arch-commits] Commit in fltk/trunk (PKGBUILD tigervnc.patch)

2014-11-14 Thread Eric Bélanger 
Date: Friday, November 14, 2014 @ 19:31:11
  Author: eric
Revision: 226249

upgpkg: fltk 1.3.3-1

Upstream update, Add glu depends, Add build fix, Remove old patch

Modified:
  fltk/trunk/PKGBUILD
Deleted:
  fltk/trunk/tigervnc.patch

+
 PKGBUILD   |   18 
 tigervnc.patch | 3903 ---
 2 files changed, 8 insertions(+), 3913 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 226248:226249 to see the changes.

[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-config-dynlibs.patch)

2013-12-25 Thread Bartłomiej Piotrowski 
Date: Thursday, December 26, 2013 @ 08:00:36
  Author: bpiotrowski
Revision: 202753

upgpkg: fltk 1.3.2-5

- fix detection of dynamic ftlk libraries in fltk-config (FS#38276)

Added:
  fltk/trunk/fltk-config-dynlibs.patch
Modified:
  fltk/trunk/PKGBUILD

---+
 PKGBUILD  |   11 +++
 fltk-config-dynlibs.patch |   37 +
 2 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-25 21:31:15 UTC (rev 202752)
+++ PKGBUILD2013-12-26 07:00:36 UTC (rev 202753)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
@@ -11,13 +11,16 @@
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
  'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
-tigervnc.patch)
+tigervnc.patch
+fltk-config-dynlibs.patch)
 md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d'
- '9efdf03a449d7639b6da493cb0972bba')
+ '9efdf03a449d7639b6da493cb0972bba'
+ 'b7ca1a3f5055aabe9c823e650db5b0b0')
 
 prepare() {
   cd $pkgbase-$pkgver
-  patch -Np1 -i ../tigervnc.patch
+  patch -p1 -i ../tigervnc.patch
+  patch -p1 -i ../fltk-config-dynlibs.patch
 }
 
 build() {

Added: fltk-config-dynlibs.patch
===
--- fltk-config-dynlibs.patch   (rev 0)
+++ fltk-config-dynlibs.patch   2013-12-26 07:00:36 UTC (rev 202753)
@@ -0,0 +1,37 @@
+diff -rupN a/fltk-config.in b/fltk-config.in
+--- a/fltk-config.in   2011-07-19 06:49:30.0 +0200
 b/fltk-config.in   2013-12-26 07:50:58.393155344 +0100
+@@ -357,26 +357,26 @@ if test $echo_ldstaticflags = yes; t
+ fi
+ 
+ if test $echo_libs = yes; then
+-USELIBS=$libdir/libfltk.a
++USELIBS=$libdir/libfltk.so
+ 
+ if test x$use_forms = xyes; then
+-USELIBS=$libdir/libfltk_forms.a $USELIBS
++USELIBS=$libdir/libfltk_forms.so $USELIBS
+ fi
+ 
+ if test x$use_gl = xyes; then
+-USELIBS=$libdir/libfltk_gl.a $USELIBS
++USELIBS=$libdir/libfltk_gl.so $USELIBS
+ fi
+ 
+ if test x$use_cairo = xyes; then
+-USELIBS=$libdir/libfltk_cairo.a $USELIBS
++USELIBS=$libdir/libfltk_cairo.so $USELIBS
+ fi
+ 
+ if test x$use_images = xyes; then
+-USELIBS=$libdir/libfltk_images.a $USELIBS
++USELIBS=$libdir/libfltk_images.so $USELIBS
+ 
+ for lib in fltk_jpeg fltk_png fltk_z; do
+-if test -f $libdir/lib$lib.a; then
+-USELIBS=$libdir/lib$lib.a $USELIBS
++if test -f $libdir/lib$lib.so; then
++USELIBS=$libdir/lib$lib.so $USELIBS
+ fi
+   done
+ fi

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2013-10-27 Thread Eric Bélanger 
Date: Sunday, October 27, 2013 @ 20:08:45
  Author: eric
Revision: 197653

upgpkg: fltk 1.3.2-4

Rebuild without static libraries, Clean up PKGBUILD

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |   27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-27 18:25:32 UTC (rev 197652)
+++ PKGBUILD2013-10-27 19:08:45 UTC (rev 197653)
@@ -4,11 +4,11 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
-makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
  'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
 tigervnc.patch)
@@ -16,31 +16,29 @@
  '9efdf03a449d7639b6da493cb0972bba')
 
 prepare() {
-  cd $srcdir/$pkgbase-$pkgver
+  cd $pkgbase-$pkgver
   patch -Np1 -i ../tigervnc.patch
 }
 
 build() {
-  cd $srcdir/$pkgbase-$pkgver
+  cd $pkgbase-$pkgver
   sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
  -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make
-  cd documentation
-  make html
+  make -C documentation html
 }
 
 package_fltk() {
   pkgdesc=Graphical user interface toolkit for X
-  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
+  depends=('libjpeg' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
'desktop-file-utils' 'xdg-utils' 'libxcursor')
   options=('!docs')
   install=fltk.install
 
-  cd $srcdir/$pkgbase-$pkgver
+  cd $pkgbase-$pkgver
   make DESTDIR=$pkgdir install
-  (cd fluid; make DESTDIR=$pkgdir install install-linux)
-  chmod 644 $pkgdir/usr/lib/*.a
+  make DESTDIR=$pkgdir -C fluid install install-linux
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
@@ -47,13 +45,12 @@
 package_fltk-docs() {
   pkgdesc=Graphical user interface toolkit for X (documentation)
 
-  cd $srcdir/$pkgbase-$pkgver/documentation
+  cd $pkgbase-$pkgver/documentation
   install -d $pkgdir/usr/share/doc/fltk/
   for _file in html/* ; do
 install -m644 $_file $pkgdir/usr/share/doc/fltk/
   done
-  cd ../test
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C ../test install
   install -D -m644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
@@ -62,8 +59,8 @@
   depends=('alsa-lib' 'fltk')
   install=fltk-games.install
 
-  cd $srcdir/$pkgbase-$pkgver/test
+  cd $pkgbase-$pkgver/test
   make DESTDIR=$pkgdir install-linux
-  (cd ../documentation;  make DESTDIR=$pkgdir install-linux)
+  make DESTDIR=$pkgdir -C ../documentation install-linux
   install -D -m644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in fltk/trunk (PKGBUILD tigervnc.patch)

2013-09-14 Thread Bartłomiej Piotrowski 
Date: Saturday, September 14, 2013 @ 10:19:39
  Author: bpiotrowski
Revision: 194346

upgpkg: fltk 1.3.2-3

- backport patches for internal copy support (FS#36186)

Added:
  fltk/trunk/tigervnc.patch
Modified:
  fltk/trunk/PKGBUILD

+
 PKGBUILD   |   17 
 tigervnc.patch | 3903 +++
 2 files changed, 3915 insertions(+), 5 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 194345:194346 to see the changes.

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2013-04-27 Thread Evangelos Foutras 
Date: Sunday, April 28, 2013 @ 01:42:56
  Author: foutrelis
Revision: 183790

upgpkg: fltk 1.3.2-2

libpng 1.6 rebuild.

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-27 23:42:28 UTC (rev 183789)
+++ PKGBUILD2013-04-27 23:42:56 UTC (rev 183790)
@@ -4,13 +4,13 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
  'alsa-lib' 'desktop-file-utils')
-source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
+source=(http://www.fltk.org/tars/releases/$pkgbase-$pkgver-source.tar.gz)
 md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d')
 
 build() {

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2012-12-10 Thread Eric Bélanger 
Date: Monday, December 10, 2012 @ 21:29:55
  Author: eric
Revision: 173103

upgpkg: fltk 1.3.2-1

Upstreeam update, Add glu makedepends

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-11 00:42:05 UTC (rev 173102)
+++ PKGBUILD2012-12-11 02:29:55 UTC (rev 173103)
@@ -3,15 +3,15 @@
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
-makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
  'alsa-lib' 'desktop-file-utils')
 
source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('b5b84ed63751ab3f76aa8d36cccf59e7')
+md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2012-11-07 Thread Eric Bélanger 
Date: Wednesday, November 7, 2012 @ 18:37:37
  Author: eric
Revision: 170533

upgpkg: fltk 1.3.1-1

Upstream update

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-07 20:53:57 UTC (rev 170532)
+++ PKGBUILD2012-11-07 23:37:37 UTC (rev 170533)
@@ -3,15 +3,15 @@
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.0
-pkgrel=3
+pkgver=1.3.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
 makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
  'alsa-lib' 'desktop-file-utils')
 
source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
+md5sums=('b5b84ed63751ab3f76aa8d36cccf59e7')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2012-01-19 Thread Eric Bélanger 
Date: Thursday, January 19, 2012 @ 16:28:49
  Author: eric
Revision: 146978

upgpkg: fltk 1.3.0-3

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 20:58:08 UTC (rev 146977)
+++ PKGBUILD2012-01-19 21:28:49 UTC (rev 146978)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;

[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-games.install)

2011-11-05 Thread Eric Bélanger 
Date: Saturday, November 5, 2011 @ 16:03:21
  Author: eric
Revision: 142178

Split games in seperate package (close FS#26746)

Added:
  fltk/trunk/fltk-games.install
Modified:
  fltk/trunk/PKGBUILD

+
 PKGBUILD   |   28 ++--
 fltk-games.install |   11 +++
 2 files changed, 33 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-05 16:31:54 UTC (rev 142177)
+++ PKGBUILD2011-11-05 20:03:21 UTC (rev 142178)
@@ -1,19 +1,22 @@
 # $Id$
+# Maintainer:
 
 pkgbase=fltk
-pkgname=('fltk' 'fltk-docs')
+pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url=http://www.fltk.org/;
-depends=('sh' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'alsa-lib' 
'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
-makedepends=('mesa' 'doxygen')
+makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+ 'alsa-lib' 'desktop-file-utils')
 
source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
 md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
+  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
+ -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make
   cd documentation
@@ -22,18 +25,20 @@
 
 package_fltk() {
   pkgdesc=Graphical user interface toolkit for X
+  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
+   'desktop-file-utils' 'xdg-utils')
   options=('!docs')
   install=fltk.install
 
   cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=$pkgdir install install-desktop
+  make DESTDIR=$pkgdir install
+  (cd fluid; make DESTDIR=$pkgdir install install-linux)
   chmod 644 $pkgdir/usr/lib/*.a
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_fltk-docs() {
   pkgdesc=Graphical user interface toolkit for X (documentation)
-  depends=('')
 
   cd $srcdir/$pkgbase-$pkgver/documentation
   install -d $pkgdir/usr/share/doc/fltk/
@@ -44,3 +49,14 @@
   make DESTDIR=$pkgdir install
   install -D -m644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
+
+package_fltk-games() {
+  pkgdesc=Example games that accompany FLTK: blocks, checkers and sudoku
+  depends=('alsa-lib' 'fltk')
+  install=fltk-games.install
+
+  cd $srcdir/$pkgbase-$pkgver/test
+  make DESTDIR=$pkgdir install-linux
+  (cd ../documentation;  make DESTDIR=$pkgdir install-linux)
+  install -D -m644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Added: fltk-games.install
===
--- fltk-games.install  (rev 0)
+++ fltk-games.install  2011-11-05 20:03:21 UTC (rev 142178)
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install 
+}

[arch-commits] Commit in fltk/trunk (PKGBUILD fltk.install)

2011-07-04 Thread Eric Bélanger 
Date: Monday, July 4, 2011 @ 17:56:54
  Author: eric
Revision: 130308

upgpkg: fltk 1.3.0-1
Upstream update, Add splitted pkg for docs, Fix license, Add install scriptlet 
to update desktop database and icon cache

Added:
  fltk/trunk/fltk.install
Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |   50 +++---
 fltk.install |   12 
 2 files changed, 47 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-04 19:58:25 UTC (rev 130307)
+++ PKGBUILD2011-07-04 21:56:54 UTC (rev 130308)
@@ -1,26 +1,46 @@
 # $Id$
 
-pkgname=fltk
-pkgver=1.1.10
+pkgbase=fltk
+pkgname=('fltk' 'fltk-docs')
+pkgver=1.3.0
 pkgrel=1
-pkgdesc=Graphical user interface toolkit for X
 arch=('i686' 'x86_64')
-license=('LGPL')
+license=('custom:LGPL')
 url=http://www.fltk.org/;
-depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext')
-makedepends=('mesa')
-source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2;)
-md5sums=('a1765594bc427ff892e36089fe1fa672')
+depends=('sh' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'alsa-lib' 
'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
+makedepends=('mesa' 'doxygen')
+source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
+md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  export LDFLAGS=${LDFLAGS//-Wl,--as-needed}
-  export LDFLAGS=${LDFLAGS//,--as-needed}
+  cd $srcdir/$pkgbase-$pkgver
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-  make || return 1
+  make
+  cd documentation
+  make html
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+package_fltk() {
+  pkgdesc=Graphical user interface toolkit for X
+  options=('!docs')
+  install=fltk.install
+
+  cd $srcdir/$pkgbase-$pkgver
+  make DESTDIR=$pkgdir install install-desktop
+  chmod 644 $pkgdir/usr/lib/*.a
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
+
+package_fltk-docs() {
+  pkgdesc=Graphical user interface toolkit for X (documentation)
+  depends=('')
+
+  cd $srcdir/$pkgbase-$pkgver/documentation
+  install -d $pkgdir/usr/share/doc/fltk/
+  for _file in html/* ; do
+install -m644 $_file $pkgdir/usr/share/doc/fltk/
+  done
+  cd ../test
+  make DESTDIR=$pkgdir install
+  install -D -m644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Added: fltk.install
===
--- fltk.install(rev 0)
+++ fltk.install2011-07-04 21:56:54 UTC (rev 130308)
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor  /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install 
+}

[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-1.1.9-gcc44.patch)

2010-03-05 Thread Pierre Schmitz 
Date: Friday, March 5, 2010 @ 20:40:12
  Author: pierre
Revision: 71291

upgpkg: fltk 1.1.10-1
fix FS#18333

Modified:
  fltk/trunk/PKGBUILD
Deleted:
  fltk/trunk/fltk-1.1.9-gcc44.patch

+
 PKGBUILD   |   27 +--
 fltk-1.1.9-gcc44.patch |   32 
 2 files changed, 13 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-05 23:22:18 UTC (rev 71290)
+++ PKGBUILD2010-03-06 01:40:12 UTC (rev 71291)
@@ -1,27 +1,26 @@
 # $Id$
-# Maintainer: roberto robe...@archlinux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-# Updated to produce shared libs: Andrew Rose o...@netrux.com
 
 pkgname=fltk
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.1.10
+pkgrel=1
 pkgdesc=Graphical user interface toolkit for X
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url=http://www.fltk.org/;
 depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext')
 makedepends=('mesa')
-source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
-fltk-1.1.9-gcc44.patch)
-md5sums=('e146fd264e1001b1313acfd41ef75552'
- '954d657d7831bd02aafb0e4ed9c8f8c6')
+source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2;)
+md5sums=('a1765594bc427ff892e36089fe1fa672')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/fltk-1.1.9-gcc44.patch
-  
+  cd $srcdir/$pkgname-$pkgver
+  export LDFLAGS=${LDFLAGS//-Wl,--as-needed}
+  export LDFLAGS=${LDFLAGS//,--as-needed}
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make || return 1
-  make DESTDIR=$startdir/pkg install
 }
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: fltk-1.1.9-gcc44.patch
===
--- fltk-1.1.9-gcc44.patch  2010-03-05 23:22:18 UTC (rev 71290)
+++ fltk-1.1.9-gcc44.patch  2010-03-06 01:40:12 UTC (rev 71291)
@@ -1,32 +0,0 @@
-diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 
fltk-1.1.9/src/filename_list.cxx
 fltk-1.1.9/src/filename_list.cxx.gcc44 2006-06-09 11:16:34.0 
-0500
-+++ fltk-1.1.9/src/filename_list.cxx   2009-05-13 09:46:42.372917879 -0500
-@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire
-   // The vast majority of UNIX systems want the sort function to have this
-   // prototype, most likely so that it can be passed to qsort without any
-   // changes:
--  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
-+  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
- #else
-   // This version is when we define our own scandir (WIN32 and perhaps
-   // some Unix systems) and apparently on IRIX:
-diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx 
fltk-1.1.9/src/fl_set_fonts_xft.cxx
 fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx   2009-03-04 10:58:49.0 
+
-+++ fltk-1.1.9/src/fl_set_fonts_xft.cxx2009-03-04 11:01:25.0 
+
-@@ -253,13 +253,13 @@
-   // So the bit we want is up to the first comma - BUT some strings have
-   // more than one name, separated by, guess what?, a comma...
-   stop = start = first = 0;
--  stop = strchr((const char *)font, ',');
--  start = strchr((const char *)font, ':');
-+  stop = strchr((char *)font, ',');
-+  start = strchr((char *)font, ':');
-   if ((stop)  (start)  (stop  start))
-   {
- first = stop + 1; // discard first version of name
- // find first comma *after* the end of the name
--stop = strchr((const char *)start, ',');
-+stop = strchr((char *)start, ',');
-   }
-   else
-   {

[arch-commits] Commit in fltk/trunk (PKGBUILD)

2010-01-18 Thread Pierre Schmitz 
Date: Monday, January 18, 2010 @ 08:47:43
  Author: pierre
Revision: 63751

upgpkg: fltk 1.1.9-3
jpng rebuild

Modified:
  fltk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-18 13:13:08 UTC (rev 63750)
+++ PKGBUILD2010-01-18 13:47:43 UTC (rev 63751)
@@ -5,12 +5,12 @@
 
 pkgname=fltk
 pkgver=1.1.9
-pkgrel=2
+pkgrel=3
 pkgdesc=Graphical user interface toolkit for X
 arch=(i686 x86_64)
 license=('LGPL')
 url=http://www.fltk.org/;
-depends=('libjpeg=7' 'libpng' 'gcc-libs' 'libxft' 'libxext')
+depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext')
 makedepends=('mesa')
 
source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
 fltk-1.1.9-gcc44.patch)