mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
fltk, bump to 1.4.4 (#12690)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -14,8 +14,8 @@ COPYRIGHT="1998-2021 by Bill Spitzak and others."
|
||||
LICENSE="FLTK
|
||||
GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.fltk.org/pub/fltk/$portVersion/fltk-$portVersion-source.tar.bz2"
|
||||
CHECKSUM_SHA256="103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2"
|
||||
SOURCE_URI="https://github.com/fltk/fltk/releases/download/release-$portVersion/fltk-$portVersion-source.tar.bz2"
|
||||
CHECKSUM_SHA256="2b302c80b7ea937a8bdc01ed6718fd995035bf63e9a2895491c1001821725f1f"
|
||||
PATCHES="fltk-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -53,6 +53,9 @@ REQUIRES="
|
||||
PROVIDES_devel="
|
||||
fltk${secondaryArchSuffix}_devel = $portVersion
|
||||
cmd:fltk_config$commandSuffix = $portVersion
|
||||
cmd:fltk_options$commandSuffix = $portVersion
|
||||
cmd:fltk_options_shared$commandSuffix = $portVersion
|
||||
cmd:fluid_shared$commandSuffix = $portVersion
|
||||
cmd:fluid$commandSuffix = $portVersion
|
||||
devel:libfltk$secondaryArchSuffix = $libVersionCompat
|
||||
# devel:libfltk_cairo$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -105,10 +108,14 @@ BUILD()
|
||||
export LDFLAGS="-lnetwork"
|
||||
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=None \
|
||||
$cmakeDirArgs \
|
||||
-DOPTION_BUILD_SHARED_LIBS=ON \
|
||||
-DOPTION_INSTALL_HTML_DOCUMENTATION=ON \
|
||||
-DFLTK_DOCDIR=$docDir \
|
||||
-DFLTK_BUILD_EXAMPLES=OFF \
|
||||
-DFLTK_BUILD_SHARED_LIBS=ON \
|
||||
-DFLTK_INSTALL_HTML_DOCS=ON \
|
||||
-DFLTK_BUILD_GL=OFF \
|
||||
-DOPTION_CAIRO=OFF \
|
||||
-DOPTION_USE_GL=OFF
|
||||
-DFLTK_BUILD_TEST=OFF
|
||||
|
||||
make -Cbuild $jobArgs
|
||||
make -Cbuild/documentation html
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
From cb7860d48a6ee614b541c3896665063ecb21b320 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Thu, 11 May 2023 10:28:34 +0200
|
||||
Subject: Fix crash, kudos to waddlesplash
|
||||
|
||||
|
||||
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
|
||||
index c75ff47..61e0d07 100644
|
||||
--- a/src/Fl_Pixmap.cxx
|
||||
+++ b/src/Fl_Pixmap.cxx
|
||||
@@ -206,6 +206,7 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int H
|
||||
// make X use the bitmap as a mask:
|
||||
XSetClipMask(fl_display, fl_gc, pxm->mask_);
|
||||
XSetClipOrigin(fl_display, fl_gc, X-cx, Y-cy);
|
||||
+#ifndef __HAIKU__
|
||||
if (clip_region()) {
|
||||
// At this point, XYWH is the bounding box of the intersection between
|
||||
// the current clip region and the (portion of the) pixmap we have to draw.
|
||||
@@ -227,7 +228,9 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int H
|
||||
copy_offscreen(X1, Y1, W1, H1, pxm->id_, cx + (X1 - X), cy + (Y1 - Y));
|
||||
}
|
||||
XDestroyRegion(r);
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
copy_offscreen(X, Y, W, H, pxm->id_, cx, cy);
|
||||
}
|
||||
// put the old clip region back
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
||||
From a8f7b3266bfcb969d26d94337fd18e59bba5e71d Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Tue, 9 Jan 2024 12:45:20 +0100
|
||||
Subject: Install cmake config files in $libDir
|
||||
|
||||
|
||||
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
|
||||
index ea1a6ea..44dd495 100644
|
||||
--- a/CMake/setup.cmake
|
||||
+++ b/CMake/setup.cmake
|
||||
@@ -61,6 +61,8 @@ if (WIN32 AND NOT CYGWIN)
|
||||
set (FLTK_CONFIG_PATH CMake)
|
||||
elseif (APPLE)
|
||||
set (FLTK_CONFIG_PATH FLTK.framework/Resources/CMake)
|
||||
+elseif (HAIKU)
|
||||
+ set (FLTK_CONFIG_PATH ${FLTK_LIBDIR}/cmake)
|
||||
else ()
|
||||
set (FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
|
||||
endif (WIN32 AND NOT CYGWIN)
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
||||
From c4dc57c17bbdb59f056c1392722217ed4dc4c2bf Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Tue, 9 Jan 2024 16:15:51 +0100
|
||||
Subject: set correct xcairo header path
|
||||
|
||||
|
||||
diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H
|
||||
index d832c5e..982c1fd 100644
|
||||
--- a/FL/Fl_Cairo.H
|
||||
+++ b/FL/Fl_Cairo.H
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
# include <FL/Fl_Export.H>
|
||||
|
||||
-# include <cairo.h>
|
||||
+# include <cairo/cairo.h>
|
||||
|
||||
/**
|
||||
\addtogroup group_cairo
|
||||
diff --git a/cairo/Fl_Cairo.cxx b/cairo/Fl_Cairo.cxx
|
||||
index 53dfac9..19dae1e 100644
|
||||
--- a/cairo/Fl_Cairo.cxx
|
||||
+++ b/cairo/Fl_Cairo.cxx
|
||||
@@ -30,7 +30,7 @@
|
||||
// Win32, Apple Quartz, X11
|
||||
|
||||
# if defined(USE_X11) // X11
|
||||
-# include <cairo-xlib.h>
|
||||
+# include <cairo/cairo-xlib.h>
|
||||
# elif defined(WIN32)
|
||||
# include <cairo-win32.h>
|
||||
# elif defined(__APPLE_QUARTZ__)
|
||||
--
|
||||
2.42.1
|
||||
|
||||
78
x11-libs/fltk/patches/fltk-1.4.4.patchset
Normal file
78
x11-libs/fltk/patches/fltk-1.4.4.patchset
Normal file
@@ -0,0 +1,78 @@
|
||||
From 2aa7565df67c3341a49ecf7b6ddadd7016c3c781 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Thu, 11 May 2023 10:28:34 +0200
|
||||
Subject: Fix crash, kudos to waddlesplash
|
||||
|
||||
|
||||
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
|
||||
index 5dafe50..19460df 100644
|
||||
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
|
||||
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
|
||||
@@ -888,6 +888,7 @@ void Fl_Xlib_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm, int X, int Y, int W, in
|
||||
// make X use the bitmap as a mask:
|
||||
XSetClipMask(fl_display, gc_, *Fl_Graphics_Driver::mask(pxm));
|
||||
XSetClipOrigin(fl_display, gc_, X-cx, Y-cy);
|
||||
+#ifndef __HAIKU__
|
||||
if (clip_region()) {
|
||||
// At this point, XYWH is the bounding box of the intersection between
|
||||
// the current clip region and the (portion of the) pixmap we have to draw.
|
||||
@@ -909,7 +910,9 @@ void Fl_Xlib_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm, int X, int Y, int W, in
|
||||
XCopyArea(fl_display, *Fl_Graphics_Driver::id(pxm), fl_window, gc_, cx + (X1 - X), cy + (Y1 - Y), W1, H1, X1, Y1);
|
||||
}
|
||||
XDestroyRegion(r);
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
XCopyArea(fl_display, *Fl_Graphics_Driver::id(pxm), fl_window, gc_, cx, cy, W, H, X, Y);
|
||||
}
|
||||
// put the old clip region back
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
From 89eb4790aa8e4534fd89ba131e8cd3523a7eba30 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Tue, 9 Jan 2024 12:45:20 +0100
|
||||
Subject: Install cmake config files in $libDir
|
||||
|
||||
|
||||
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
|
||||
index 266e129..504f7a9 100644
|
||||
--- a/CMake/setup.cmake
|
||||
+++ b/CMake/setup.cmake
|
||||
@@ -97,6 +97,8 @@ if(WIN32 AND NOT CYGWIN)
|
||||
set(FLTK_CONFIG_PATH CMake)
|
||||
elseif(APPLE AND NOT FLTK_BACKEND_X11)
|
||||
set(FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
|
||||
+elseif (HAIKU)
|
||||
+ set (FLTK_CONFIG_PATH ${FLTK_LIBDIR}/cmake)
|
||||
else()
|
||||
set(FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
|
||||
endif(WIN32 AND NOT CYGWIN)
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
From bbf777d04df83a7c318d0d8610db87aab0469091 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Tue, 9 Jan 2024 16:15:51 +0100
|
||||
Subject: set correct xcairo header path
|
||||
|
||||
|
||||
diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H
|
||||
index cf43de4..7d10cae 100644
|
||||
--- a/FL/Fl_Cairo.H
|
||||
+++ b/FL/Fl_Cairo.H
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
# ifdef FLTK_HAVE_CAIRO
|
||||
|
||||
-# include <cairo.h>
|
||||
+# include <cairo/cairo.h>
|
||||
|
||||
/**
|
||||
\addtogroup group_cairo
|
||||
--
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user