diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /x11-libs/fltk/files | |
parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) |
gentoo resync : 18.11.2019
Diffstat (limited to 'x11-libs/fltk/files')
-rw-r--r-- | x11-libs/fltk/files/fltk-1.3.5-cmake.patch | 33 | ||||
-rw-r--r-- | x11-libs/fltk/files/fltk-1.3.5-optim.patch | 11 |
2 files changed, 44 insertions, 0 deletions
diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch new file mode 100644 index 000000000000..1eac250248d2 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch @@ -0,0 +1,33 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,7 @@ + FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} + FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0 + FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION} ++FLTK_VERSION_FULL=${FL_VERSION} + + AC_SUBST(FL_MAJOR_VERSION) + AC_SUBST(FL_MINOR_VERSION) +@@ -64,6 +65,7 @@ + AC_SUBST(FL_DSO_VERSION) + AC_SUBST(FL_ABI_VERSION) + AC_SUBST(FL_VERSION) ++AC_SUBST(FLTK_VERSION_FULL) + + AC_SUBST(ARCHFLAGS) + AC_SUBST(OPTIM) +@@ -1576,10 +1578,13 @@ + BINARY_DIR= + AC_SUBST(BINARY_DIR) + ++INCLUDE_DIRS="${includedir}" ++AC_SUBST(INCLUDE_DIRS) ++ + dnl Write all of the files... + AC_CONFIG_HEADER(config.h:configh.in) + AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in) +-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile]) ++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake]) + AC_OUTPUT + + dnl Make sure the fltk-config script is executable... diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch new file mode 100644 index 000000000000..4d1512d749dd --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.5-optim.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1265,7 +1265,7 @@ + if test "x$with_optim" != x; then + OPTIM="$with_optim $OPTIM" + else +- OPTIM="-Os $OPTIM" ++ OPTIM=" $OPTIM" + fi + fi + |