[arch-commits] Commit in fltk/repos/community-x86_64 (6 files)
David Runge
dvzrv at archlinux.org
Mon Mar 11 17:28:08 UTC 2019
Date: Monday, March 11, 2019 @ 17:28:08
Author: dvzrv
Revision: 439787
archrelease: copy trunk to community-x86_64
Added:
fltk/repos/community-x86_64/PKGBUILD
(from rev 439786, fltk/trunk/PKGBUILD)
fltk/repos/community-x86_64/fltk-fix-lib-mess.patch
(from rev 439786, fltk/trunk/fltk-fix-lib-mess.patch)
Deleted:
fltk/repos/community-x86_64/PKGBUILD
fltk/repos/community-x86_64/fltk-config-dynlibs.patch
fltk/repos/community-x86_64/fltk-libpng.patch
fltk/repos/community-x86_64/fltk-pkgconf.patch
---------------------------+
PKGBUILD | 151 ++++++++---------
fltk-config-dynlibs.patch | 97 -----------
fltk-fix-lib-mess.patch | 375 ++++++++++++++++++++++++++++++++++++++++++++
fltk-libpng.patch | 11 -
fltk-pkgconf.patch | 19 --
5 files changed, 445 insertions(+), 208 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-11 17:28:02 UTC (rev 439786)
+++ PKGBUILD 2019-03-11 17:28:08 UTC (rev 439787)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: David Runge <dave at sleepmap.de>
-
-_pkgver=1.3.4-2
-pkgbase=fltk
-pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=${_pkgver//-/.}
-pkgrel=3
-pkgdesc="Graphical user interface toolkit for X"
-arch=('x86_64')
-license=('custom' 'LGPL')
-url="http://www.fltk.org/"
-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"
- "${pkgbase}-config-dynlibs.patch"
- "${pkgbase}-libpng.patch"
- "${pkgbase}-pkgconf.patch")
-sha512sums=('cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d'
- 'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5'
- 'e8e9b79936a09c333ce915a6215753878b6ac8a9800fd2b042e420c266ed1a05fa804eeb70a4fac6ee62ae94e2f24a7a08c4eea0767344524870d558ca1ffc02'
- '68c42be32141de7a3014b3f4f180b80feae02af33a5345e9cd9000042b9887037f34f08cc74b7a771f66db668613638650c6153c8a7b2471158bec6ec203af35')
-
-prepare() {
- cd "${pkgbase}-${_pkgver}"
- # Fix broken removal of static linking: https://bugs.archlinux.org/task/38276
- 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
- make
- make -C documentation html
-}
-
-package_fltk() {
- pkgdesc="Graphical user interface toolkit for X"
- 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 -vDm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_fltk-docs() {
- pkgdesc="Graphical user interface toolkit for X (documentation)"
-
- cd "${pkgbase}-${_pkgver}/documentation"
- make DESTDIR="$pkgdir" -C ../test install
- install -vDm 644 html/* -t "${pkgdir}/usr/share/doc/fltk/"
- install -vDm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_fltk-games() {
- pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
- depends=('alsa-lib' 'fltk')
-
- cd "${pkgbase}-${_pkgver}/test"
- make DESTDIR="$pkgdir" install-linux
- make DESTDIR="$pkgdir" -C ../documentation install-linux
- install -vDm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: fltk/repos/community-x86_64/PKGBUILD (from rev 439786, fltk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-11 17:28:08 UTC (rev 439787)
@@ -0,0 +1,70 @@
+# Maintainer: David Runge <dave at sleepmap.de>
+
+pkgbase=fltk
+pkgname=('fltk' 'fltk-docs')
+pkgver=1.3.5
+pkgrel=1
+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"
+ "${pkgname}-fix-lib-mess.patch")
+sha512sums=('35732df4d66573fdabf95f57069c5a2df63b0029d7b904d4ac02bd4c3ab3e5b287d4f06998b67129e8195c42c0b39e137e5d4f10baf4d73992077bb5ae0bef6c'
+ '14592ba5616483df1b36f6e2b8309a3d1e898c5c4dcf0ddfbb374bbd1332eca6ba3490569fc8f903023a069b7771ed06baddef36140253e2e81eb409892bbba5')
+
+prepare() {
+ mv -v "${pkgbase}-release-${pkgver}" "${pkgbase}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
+ # 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 \
+ -DOPTION_CREATE_LINKS=ON \
+ -DOPTION_BUILD_SHARED_LIBS=ON \
+ -DOPTION_BUILD_HTML_DOCUMENTATION=ON \
+ -DOPTION_INSTALL_HTML_DOCUMENTATION=ON \
+ ..
+ make VERBOSE=1
+ make -C documentation html
+}
+
+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')
+ options=('!docs' 'staticlibs')
+
+ cd "${pkgbase}-${pkgver}/build"
+ make DESTDIR="${pkgdir}/" install
+ install -vDm 644 ../COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+ # 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" \
+ -t "${pkgdir}/usr/share/applications/"
+ install -vDm 644 "../test/desktop/$app-32.png" \
+ "${pkgdir}/usr/share/icons/hicolor/32x32/apps/$app.png"
+ install -vDm 644 "../test/desktop/$app-128.png" \
+ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/$app.png"
+ done
+}
+
+package_fltk-docs() {
+ pkgdesc="Graphical user interface toolkit for X (documentation)"
+
+ cd "${pkgbase}-${pkgver}/build"
+ make DESTDIR="$pkgdir" -C documentation install
+ install -vDm 644 ../COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
+
Deleted: fltk-config-dynlibs.patch
===================================================================
--- fltk-config-dynlibs.patch 2019-03-11 17:28:02 UTC (rev 439786)
+++ fltk-config-dynlibs.patch 2019-03-11 17:28:08 UTC (rev 439787)
@@ -1,97 +0,0 @@
-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"
-
- 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
Copied: fltk/repos/community-x86_64/fltk-fix-lib-mess.patch (from rev 439786, fltk/trunk/fltk-fix-lib-mess.patch)
===================================================================
--- fltk-fix-lib-mess.patch (rev 0)
+++ fltk-fix-lib-mess.patch 2019-03-11 17:28:08 UTC (rev 439787)
@@ -0,0 +1,375 @@
+diff -ruN b/CMake/macros.cmake a/CMake/macros.cmake
+--- b/CMake/macros.cmake 2019-03-03 09:40:23.000000000 +0100
++++ a/CMake/macros.cmake 2019-03-10 21:58:32.895224605 +0100
+@@ -22,11 +22,7 @@
+ #######################################################################
+ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
+
+- if (${LIBTYPE} STREQUAL "SHARED")
+- set (LIBRARY_NAME ${LIBNAME}_SHARED)
+- else ()
+- set (LIBRARY_NAME ${LIBNAME})
+- endif (${LIBTYPE} STREQUAL "SHARED")
++ set (LIBRARY_NAME ${LIBNAME}_${LIBTYPE})
+
+ if (MSVC)
+ set (LIBRARY_NAME_DEBUG "${LIBRARY_NAME}d")
+@@ -38,7 +34,7 @@
+
+ set_target_properties(${LIBRARY_NAME}
+ PROPERTIES
+- OUTPUT_NAME ${LIBRARY_NAME}
++ OUTPUT_NAME ${LIBNAME}
+ DEBUG_OUTPUT_NAME ${LIBRARY_NAME_DEBUG}
+ CLEAN_DIRECT_OUTPUT TRUE
+ COMPILE_DEFINITIONS "FL_LIBRARY"
+@@ -47,6 +43,7 @@
+ if (${LIBTYPE} STREQUAL "SHARED")
+ set_target_properties(${LIBRARY_NAME}
+ PROPERTIES
++ OUTPUT_NAME ${LIBNAME}
+ VERSION ${FLTK_VERSION_FULL}
+ SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
+ PREFIX "lib" # for MSVC static/shared coexistence
+diff -ruN b/documentation/CMakeLists.txt a/documentation/CMakeLists.txt
+--- b/documentation/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100
++++ a/documentation/CMakeLists.txt 2019-03-10 22:40:51.077135317 +0100
+@@ -45,7 +45,7 @@
+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Generating HTML documentation" VERBATIM
+- DEPENDS fltk
++ DEPENDS fltk_STATIC
+ )
+
+ endif(OPTION_BUILD_HTML_DOCUMENTATION)
+@@ -92,7 +92,7 @@
+ COMMAND cp -f latex/refman.pdf fltk.pdf
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Generating PDF documentation" VERBATIM
+- DEPENDS fltk
++ DEPENDS fltk_STATIC
+ )
+
+ # add target 'pdf'
+diff -ruN b/fluid/CMakeLists.txt a/fluid/CMakeLists.txt
+--- b/fluid/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100
++++ a/fluid/CMakeLists.txt 2019-03-10 22:09:52.482801651 +0100
+@@ -48,7 +48,7 @@
+ add_executable(fluid WIN32 ${CPPFILES})
+ endif(APPLE AND NOT OPTION_APPLE_X11)
+
+-target_link_libraries(fluid fltk fltk_images fltk_forms)
++target_link_libraries(fluid fltk_STATIC fltk_images_STATIC fltk_forms_STATIC)
+
+ # install fluid
+
+diff -ruN b/src/CMakeLists.txt a/src/CMakeLists.txt
+--- b/src/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100
++++ a/src/CMakeLists.txt 2019-03-10 22:57:37.458302812 +0100
+@@ -246,7 +246,7 @@
+ endif (WIN32)
+
+ if (FLTK_HAVE_CAIRO)
+- list(APPEND OPTIONAL_LIBS fltk_cairo ${PKG_CAIRO_LIBRARIES})
++ list(APPEND OPTIONAL_LIBS fltk_cairo_STATIC ${PKG_CAIRO_LIBRARIES})
+ ENDif (FLTK_HAVE_CAIRO)
+
+ if (HAVE_XINERAMA)
+@@ -275,41 +275,41 @@
+ #######################################################################
+
+ FL_ADD_LIBRARY(fltk STATIC "${STATIC_FILES}")
+-target_link_libraries(fltk ${OPTIONAL_LIBS})
++target_link_libraries(fltk_STATIC ${OPTIONAL_LIBS})
+
+ #######################################################################
+
+ FL_ADD_LIBRARY(fltk_forms STATIC "${FLCPPFILES}")
+-target_link_libraries(fltk_forms fltk)
++target_link_libraries(fltk_forms_STATIC fltk_STATIC)
+
+ #######################################################################
+
+ FL_ADD_LIBRARY(fltk_images STATIC "${IMGCPPFILES}")
+-target_link_libraries(fltk_images fltk)
++target_link_libraries(fltk_images_STATIC fltk_STATIC)
+
+ if (OPTION_USE_SYSTEM_LIBJPEG)
+- target_link_libraries(fltk_images ${FLTK_JPEG_LIBRARIES})
++ target_link_libraries(fltk_images_STATIC ${FLTK_JPEG_LIBRARIES})
+ else()
+- target_link_libraries(fltk_images fltk_jpeg)
++ target_link_libraries(fltk_images_STATIC fltk_jpeg_STATIC)
+ endif (OPTION_USE_SYSTEM_LIBJPEG)
+
+ if (OPTION_USE_SYSTEM_ZLIB)
+- target_link_libraries(fltk_images ${FLTK_ZLIB_LIBRARIES})
++ target_link_libraries(fltk_images_STATIC ${FLTK_ZLIB_LIBRARIES})
+ else()
+- target_link_libraries(fltk_images fltk_z)
++ target_link_libraries(fltk_images_STATIC fltk_z_STATIC)
+ endif (OPTION_USE_SYSTEM_ZLIB)
+
+ if (OPTION_USE_SYSTEM_LIBPNG)
+- target_link_libraries(fltk_images ${FLTK_PNG_LIBRARIES})
++ target_link_libraries(fltk_images_STATIC ${FLTK_PNG_LIBRARIES})
+ else()
+- target_link_libraries(fltk_images fltk_png)
++ target_link_libraries(fltk_images_STATIC fltk_png_STATIC)
+ endif (OPTION_USE_SYSTEM_LIBPNG)
+
+ #######################################################################
+
+ if (OPENGL_FOUND)
+ FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES}")
+- target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES})
++ target_link_libraries(fltk_gl_STATIC fltk_STATIC ${OPENGL_LIBRARIES})
+ endif (OPENGL_FOUND)
+
+ #######################################################################
+@@ -332,7 +332,7 @@
+
+ FL_ADD_LIBRARY(fltk_forms SHARED "${FLCPPFILES}")
+ if (MSVC)
+- target_link_libraries(fltk_forms_SHARED fltk)
++ target_link_libraries(fltk_forms_SHARED fltk_SHARED)
+ else ()
+ target_link_libraries(fltk_forms_SHARED fltk_SHARED)
+ endif (MSVC)
+@@ -341,27 +341,27 @@
+
+ FL_ADD_LIBRARY(fltk_images SHARED "${IMGCPPFILES}")
+ if (MSVC)
+- target_link_libraries(fltk_images_SHARED fltk)
++ target_link_libraries(fltk_images_SHARED fltk_SHARED)
+ else ()
+ target_link_libraries(fltk_images_SHARED fltk_SHARED)
+ endif (MSVC)
+
+ if (OPTION_USE_SYSTEM_LIBJPEG)
+- target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
++ target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
+ else()
+- target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED)
++ target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED)
+ endif (OPTION_USE_SYSTEM_LIBJPEG)
+
+ if (OPTION_USE_SYSTEM_LIBPNG)
+- target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
++ target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
+ else()
+- target_link_libraries(fltk_images_SHARED fltk_png_SHARED)
++ target_link_libraries(fltk_images_SHARED fltk_png_SHARED)
+ endif (OPTION_USE_SYSTEM_LIBPNG)
+
+ if (OPTION_USE_SYSTEM_ZLIB)
+- target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
++ target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
+ else()
+- target_link_libraries(fltk_images_SHARED fltk_z_SHARED)
++ target_link_libraries(fltk_images_SHARED fltk_z_SHARED)
+ endif (OPTION_USE_SYSTEM_ZLIB)
+
+ ###################################################################
+@@ -369,9 +369,9 @@
+ if (OPENGL_FOUND)
+ FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES}")
+ if (MSVC)
+- target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES})
++ target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
+ else ()
+- target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
++ target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
+ endif (MSVC)
+ endif (OPENGL_FOUND)
+
+diff -ruN b/test/CMakeLists.txt a/test/CMakeLists.txt
+--- b/test/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100
++++ a/test/CMakeLists.txt 2019-03-10 23:13:36.096519270 +0100
+@@ -25,108 +25,108 @@
+ endif(APPLE AND NOT OPTION_APPLE_X11)
+
+ #######################################################################
+-CREATE_EXAMPLE(adjuster adjuster.cxx fltk)
+-CREATE_EXAMPLE(arc arc.cxx fltk)
+-CREATE_EXAMPLE(animated animated.cxx fltk)
+-CREATE_EXAMPLE(ask ask.cxx fltk)
+-CREATE_EXAMPLE(bitmap bitmap.cxx fltk)
++CREATE_EXAMPLE(adjuster adjuster.cxx fltk_STATIC)
++CREATE_EXAMPLE(arc arc.cxx fltk_STATIC)
++CREATE_EXAMPLE(animated animated.cxx fltk_STATIC)
++CREATE_EXAMPLE(ask ask.cxx fltk_STATIC)
++CREATE_EXAMPLE(bitmap bitmap.cxx fltk_STATIC)
+
+ set(BLOCKS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/blocks.app/Contents/Resources/blocks.icns")
+-CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk;${AUDIOLIBS}")
++CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk_STATIC;${AUDIOLIBS}")
+
+-CREATE_EXAMPLE(boxtype boxtype.cxx fltk)
+-CREATE_EXAMPLE(browser browser.cxx fltk)
+-CREATE_EXAMPLE(button button.cxx fltk)
+-CREATE_EXAMPLE(buttons buttons.cxx fltk)
++CREATE_EXAMPLE(boxtype boxtype.cxx fltk_STATIC)
++CREATE_EXAMPLE(browser browser.cxx fltk_STATIC)
++CREATE_EXAMPLE(button button.cxx fltk_STATIC)
++CREATE_EXAMPLE(buttons buttons.cxx fltk_STATIC)
+
+ set(CHECKERS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/checkers.app/Contents/Resources/checkers.icns")
+-CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk)
++CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk_STATIC)
+
+-CREATE_EXAMPLE(clock clock.cxx fltk)
+-CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk;fltk_forms")
+-CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk)
+-CREATE_EXAMPLE(cursor cursor.cxx fltk)
+-CREATE_EXAMPLE(curve curve.cxx fltk)
++CREATE_EXAMPLE(clock clock.cxx fltk_STATIC)
++CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk_STATIC;fltk_forms_STATIC")
++CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk_STATIC)
++CREATE_EXAMPLE(cursor cursor.cxx fltk_STATIC)
++CREATE_EXAMPLE(curve curve.cxx fltk_STATIC)
+
+-CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk)
++CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk_STATIC)
+ set_source_files_properties(demo.menu PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+
+-CREATE_EXAMPLE(device device.cxx fltk)
+-CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk)
++CREATE_EXAMPLE(device device.cxx fltk_STATIC)
++CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk_STATIC)
+
+-CREATE_EXAMPLE(editor editor.cxx fltk)
++CREATE_EXAMPLE(editor editor.cxx fltk_STATIC)
+ set_target_properties(editor PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/ide/Xcode4/plists/editor-Info.plist"
+ )
+
+-CREATE_EXAMPLE(fast_slow fast_slow.fl fltk)
+-CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images")
+-CREATE_EXAMPLE(fonts fonts.cxx fltk)
+-CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
+-CREATE_EXAMPLE(hello hello.cxx fltk)
+-CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
+-CREATE_EXAMPLE(icon icon.cxx fltk)
+-CREATE_EXAMPLE(iconize iconize.cxx fltk)
+-CREATE_EXAMPLE(image image.cxx fltk)
+-CREATE_EXAMPLE(inactive inactive.fl fltk)
+-CREATE_EXAMPLE(input input.cxx fltk)
+-CREATE_EXAMPLE(input_choice input_choice.cxx fltk)
+-CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk)
+-CREATE_EXAMPLE(label label.cxx "fltk;fltk_forms")
+-CREATE_EXAMPLE(line_style line_style.cxx fltk)
+-CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk)
+-CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk)
+-CREATE_EXAMPLE(menubar menubar.cxx fltk)
+-CREATE_EXAMPLE(message message.cxx fltk)
+-CREATE_EXAMPLE(minimum minimum.cxx fltk)
+-CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk;fltk_images")
+-CREATE_EXAMPLE(navigation navigation.cxx fltk)
+-CREATE_EXAMPLE(output output.cxx "fltk;fltk_forms")
+-CREATE_EXAMPLE(overlay overlay.cxx fltk)
+-CREATE_EXAMPLE(pack pack.cxx fltk)
+-CREATE_EXAMPLE(pixmap pixmap.cxx fltk)
+-CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk;fltk_images")
+-CREATE_EXAMPLE(preferences preferences.fl fltk)
+-CREATE_EXAMPLE(offscreen offscreen.cxx fltk)
+-CREATE_EXAMPLE(radio radio.fl fltk)
+-CREATE_EXAMPLE(resize resize.fl fltk)
+-CREATE_EXAMPLE(resizebox resizebox.cxx fltk)
+-CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk)
+-CREATE_EXAMPLE(scroll scroll.cxx fltk)
+-CREATE_EXAMPLE(subwindow subwindow.cxx fltk)
++CREATE_EXAMPLE(fast_slow fast_slow.fl fltk_STATIC)
++CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk_STATIC;fltk_images_STATIC")
++CREATE_EXAMPLE(fonts fonts.cxx fltk_STATIC)
++CREATE_EXAMPLE(forms forms.cxx "fltk_STATIC;fltk_forms_STATIC")
++CREATE_EXAMPLE(hello hello.cxx fltk_STATIC)
++CREATE_EXAMPLE(help help.cxx "fltk_STATIC;fltk_images_STATIC")
++CREATE_EXAMPLE(icon icon.cxx fltk_STATIC)
++CREATE_EXAMPLE(iconize iconize.cxx fltk_STATIC)
++CREATE_EXAMPLE(image image.cxx fltk_STATIC)
++CREATE_EXAMPLE(inactive inactive.fl fltk_STATIC)
++CREATE_EXAMPLE(input input.cxx fltk_STATIC)
++CREATE_EXAMPLE(input_choice input_choice.cxx fltk_STATIC)
++CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk_STATIC)
++CREATE_EXAMPLE(label label.cxx "fltk_STATIC;fltk_forms_STATIC")
++CREATE_EXAMPLE(line_style line_style.cxx fltk_STATIC)
++CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk_STATIC)
++CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk_STATIC)
++CREATE_EXAMPLE(menubar menubar.cxx fltk_STATIC)
++CREATE_EXAMPLE(message message.cxx fltk_STATIC)
++CREATE_EXAMPLE(minimum minimum.cxx fltk_STATIC)
++CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk_STATIC;fltk_images_STATIC")
++CREATE_EXAMPLE(navigation navigation.cxx fltk_STATIC)
++CREATE_EXAMPLE(output output.cxx "fltk_STATIC;fltk_forms_STATIC")
++CREATE_EXAMPLE(overlay overlay.cxx fltk_STATIC)
++CREATE_EXAMPLE(pack pack.cxx fltk_STATIC)
++CREATE_EXAMPLE(pixmap pixmap.cxx fltk_STATIC)
++CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk_STATIC;fltk_images_STATIC")
++CREATE_EXAMPLE(preferences preferences.fl fltk_STATIC)
++CREATE_EXAMPLE(offscreen offscreen.cxx fltk_STATIC)
++CREATE_EXAMPLE(radio radio.fl fltk_STATIC)
++CREATE_EXAMPLE(resize resize.fl fltk_STATIC)
++CREATE_EXAMPLE(resizebox resizebox.cxx fltk_STATIC)
++CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk_STATIC)
++CREATE_EXAMPLE(scroll scroll.cxx fltk_STATIC)
++CREATE_EXAMPLE(subwindow subwindow.cxx fltk_STATIC)
+
+ set(SUDOKU_ICON "${CMAKE_CURRENT_SOURCE_DIR}/sudoku.app/Contents/Resources/sudoku.icns")
+-CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk;fltk_images;${AUDIOLIBS}")
++CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk_STATIC;fltk_images_STATIC;${AUDIOLIBS}")
+
+-CREATE_EXAMPLE(symbols symbols.cxx fltk)
+-CREATE_EXAMPLE(tabs tabs.fl fltk)
+-CREATE_EXAMPLE(table table.cxx fltk)
+-CREATE_EXAMPLE(threads threads.cxx fltk)
+-CREATE_EXAMPLE(tile tile.cxx fltk)
+-CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk)
+-CREATE_EXAMPLE(tree tree.fl fltk)
+-CREATE_EXAMPLE(twowin twowin.cxx fltk)
+-CREATE_EXAMPLE(utf8 utf8.cxx fltk)
+-CREATE_EXAMPLE(valuators valuators.fl fltk)
+-CREATE_EXAMPLE(unittests unittests.cxx fltk)
+-CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk)
++CREATE_EXAMPLE(symbols symbols.cxx fltk_STATIC)
++CREATE_EXAMPLE(tabs tabs.fl fltk_STATIC)
++CREATE_EXAMPLE(table table.cxx fltk_STATIC)
++CREATE_EXAMPLE(threads threads.cxx fltk_STATIC)
++CREATE_EXAMPLE(tile tile.cxx fltk_STATIC)
++CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk_STATIC)
++CREATE_EXAMPLE(tree tree.fl fltk_STATIC)
++CREATE_EXAMPLE(twowin twowin.cxx fltk_STATIC)
++CREATE_EXAMPLE(utf8 utf8.cxx fltk_STATIC)
++CREATE_EXAMPLE(valuators valuators.fl fltk_STATIC)
++CREATE_EXAMPLE(unittests unittests.cxx fltk_STATIC)
++CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk_STATIC)
+
+-CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk)
++CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk_STATIC)
+
+ # OpenGL demos...
+ if(OPENGL_FOUND)
+-CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk;fltk_gl")
+-CREATE_EXAMPLE(cube cube.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
+-CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk;fltk_gl")
+-CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk;fltk_gl")
+-CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
+-CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
+-CREATE_EXAMPLE(shape shape.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
++CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk_STATIC;fltk_gl_STATIC")
++CREATE_EXAMPLE(cube cube.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
++CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk_STATIC;fltk_gl_STATIC")
++CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk_STATIC;fltk_gl_STATIC")
++CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
++CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
++CREATE_EXAMPLE(shape shape.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
+ endif(OPENGL_FOUND)
+
+ # Cairo demo
+ if(FLTK_HAVE_CAIRO)
+- CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk;fltk_cairo")
++ CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk_STATIC;fltk_cairo_STATIC")
+ endif(FLTK_HAVE_CAIRO)
+
+ # We need some support files for the demo programs:
Deleted: fltk-libpng.patch
===================================================================
--- fltk-libpng.patch 2019-03-11 17:28:02 UTC (rev 439786)
+++ fltk-libpng.patch 2019-03-11 17:28:08 UTC (rev 439787)
@@ -1,11 +0,0 @@
---- fltk-1.3.4-2-a/configure.ac 2016-09-30 22:51:45.000000000 +0200
-+++ fltk-1.3.4-2-c/configure.ac 2018-07-18 22:30:44.021616512 +0200
-@@ -727,7 +727,7 @@
- [AC_CHECK_HEADER(png.h,
- AC_DEFINE(HAVE_PNG_H)
- syspnginc_ok=yes)
-- AC_CHECK_HEADER(libpng/png.h,
-+ AC_CHECK_HEADER(libpng16/png.h,
- AC_DEFINE(HAVE_LIBPNG_PNG_H)
- syspnginc_ok=yes)
- if test x$syspnginc_ok = xyes; then
Deleted: fltk-pkgconf.patch
===================================================================
--- fltk-pkgconf.patch 2019-03-11 17:28:02 UTC (rev 439786)
+++ fltk-pkgconf.patch 2019-03-11 17:28:08 UTC (rev 439787)
@@ -1,19 +0,0 @@
---- fltk-1.3.4-2-a/configure.ac 2016-09-30 22:51:45.000000000 +0200
-+++ fltk-1.3.4-2-b/configure.ac 2018-07-18 21:27:39.362105340 +0200
-@@ -1006,12 +1006,12 @@
-
- xft_found=no
- if test x$enable_xft != xno; then
-- AC_PATH_PROG(FTCONFIG, freetype-config)
-+ AC_PATH_PROG(FTCONFIG, pkgconf)
-
- if test "x$FTCONFIG" != x; then
-- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
-- CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
-- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
-+ CPPFLAGS="`$FTCONFIG --cflags freetype2` $CPPFLAGS"
-+ CFLAGS="`$FTCONFIG --cflags freetype2` $CFLAGS"
-+ CXXFLAGS="`$FTCONFIG --cflags freetype2` $CXXFLAGS"
-
- AC_CHECK_LIB(fontconfig, FcPatternCreate)
- AC_CHECK_HEADER(X11/Xft/Xft.h,
More information about the arch-commits
mailing list