mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
freeimage: remove _WINDOWS_ definition
That macro indicates this is Windows OS, and breaks SLADE with wxWidgets 3.2.1
This commit is contained in:
parent
ab11681444
commit
41ce1421fd
2 changed files with 20 additions and 2 deletions
15
srcpkgs/freeimage/patches/no-windows.patch
Normal file
15
srcpkgs/freeimage/patches/no-windows.patch
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
_WINDOWS_ is pre-defined macro definition for Windows OS
|
||||||
|
Other libraries detect build on Windows by this macro
|
||||||
|
Fix SLADE with wxWidgets 3.2
|
||||||
|
Index: FreeImage/Source/FreeImage.h
|
||||||
|
===================================================================
|
||||||
|
--- FreeImage.orig/Source/FreeImage.h
|
||||||
|
+++ FreeImage/Source/FreeImage.h
|
||||||
|
@@ -129,7 +129,6 @@ FI_STRUCT (FIMULTIBITMAP) { void *data;
|
||||||
|
#endif // __MINGW32__
|
||||||
|
|
||||||
|
#ifndef _WINDOWS_
|
||||||
|
-#define _WINDOWS_
|
||||||
|
|
||||||
|
#ifndef FALSE
|
||||||
|
#define FALSE 0
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'freeimage'
|
# Template file for 'freeimage'
|
||||||
pkgname=freeimage
|
pkgname=freeimage
|
||||||
version=3.18.0
|
version=3.18.0
|
||||||
revision=3
|
revision=4
|
||||||
wrksrc=FreeImage
|
wrksrc=FreeImage
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
hostmakedepends="unzip"
|
hostmakedepends="unzip"
|
||||||
|
@ -57,10 +57,13 @@ freeimage-devel_package() {
|
||||||
|
|
||||||
freeimage-plus-devel_package() {
|
freeimage-plus-devel_package() {
|
||||||
short_desc+=" (plus) - development files"
|
short_desc+=" (plus) - development files"
|
||||||
depends="freeimage-plus>=${version}_${revision}"
|
# Only needs FreeImage.h from freeimage-devel
|
||||||
|
depends="freeimage-plus>=${version}_${revision}
|
||||||
|
freeimage-devel>=${version}_${revision}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
DESTDIR="${DESTDIR/freeimage-/freeimage-plus-}"
|
DESTDIR="${DESTDIR/freeimage-/freeimage-plus-}"
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
|
rm -f "${PKGDESTDIR}/usr/include/FreeImage.h"
|
||||||
vmove usr/lib/libfreeimageplus.a
|
vmove usr/lib/libfreeimageplus.a
|
||||||
vmove usr/lib/libfreeimageplus.so
|
vmove usr/lib/libfreeimageplus.so
|
||||||
# vmkdir usr/lib
|
# vmkdir usr/lib
|
||||||
|
|
Loading…
Add table
Reference in a new issue