sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/epsonscan2: Unbreak build with boost 1.87

Browse source 
clang does support rvalue references, so remove all use of flag
"BOOST_NO_CXX11_RVALUE_REFERENCES"

PR:	284127
This commit is contained in:
J.R. Oldroyd 2025-02-14 23:38:05 +03:00 • committed by Vladimir Druzenko
parent abff0fc56a
commit 27cd1370ef
27 changed files with 310 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/epsonscan2/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= epsonscan2 PORTNAME= epsonscan2
DISTVERSION= 6.7.70.0 DISTVERSION= 6.7.70.0
PORTREVISION= 1
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/16/14/37/7577ee65efdad48ee2d2f38d9eda75418e490552/ MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/16/14/37/7577ee65efdad48ee2d2f38d9eda75418e490552/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1.src DISTNAME= ${PORTNAME}-${PORTVERSION}-1.src
@ -11,8 +12,6 @@ WWW= https://download.ebz.epson.net/man/linux/epsonscan2_e.html
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= fails to build with Boost>=1.87
BUILD_DEPENDS= sane-config:graphics/sane-backends BUILD_DEPENDS= sane-config:graphics/sane-backends
LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \
libpng.so:graphics/png \ libpng.so:graphics/png \

10
graphics/epsonscan2/files/patch-src_CommonUtility_ESCommonTypedef.h Normal file
View file

@ -0,0 +1,10 @@
--- src/CommonUtility/ESCommonTypedef.h.orig 2024-09-12 07:10:37 UTC
+++ src/CommonUtility/ESCommonTypedef.h
@@ -28,7 +28,6 @@
#endif
#include <string>
#include <sstream>
-#define BOOST_NO_CXX11_RVALUE_REFERENCES 1
#include <boost/any.hpp>
#include <unordered_map>
#include <map>

12
graphics/epsonscan2/files/patch-src_CommonUtility_Linux_CMakeFiles_commonutility.dir_DependInfo.cmake Normal file
View file

@ -0,0 +1,12 @@
--- src/CommonUtility/Linux/CMakeFiles/commonutility.dir/DependInfo.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/CommonUtility/Linux/CMakeFiles/commonutility.dir/DependInfo.cmake
@@ -20,9 +20,6 @@ set(CMAKE_CXX_COMPILER_ID "GNU")
set(CMAKE_CXX_COMPILER_ID "GNU")
# Preprocessor definitions for this target.
-set(CMAKE_TARGET_DEFINITIONS_CXX
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
- )
# The include file search paths:
set(CMAKE_CXX_TARGET_INCLUDE_PATH

11
graphics/epsonscan2/files/patch-src_CommonUtility_Linux_CMakeFiles_commonutility.dir_flags.make Normal file
View file

@ -0,0 +1,11 @@
--- src/CommonUtility/Linux/CMakeFiles/commonutility.dir/flags.make.orig 2024-09-12 07:10:30 UTC
+++ src/CommonUtility/Linux/CMakeFiles/commonutility.dir/flags.make
@@ -4,7 +4,7 @@ CXX_FLAGS = -g -std=c++11 -O0 -fPIC
# compile CXX with /usr/bin/c++
CXX_FLAGS = -g -std=c++11 -O0 -fPIC
-CXX_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -Dcommonutility_EXPORTS
+CXX_DEFINES = -Dcommonutility_EXPORTS
CXX_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/CommonUtility/Linux/.. -I/home/build/shokaku/trunk/epsonscan2/src/CommonUtility/Linux/../.. -I/home/build/shokaku/trunk/epsonscan2/src/CommonUtility/Linux/../../../thirdparty/rapidjson/include

11
graphics/epsonscan2/files/patch-src_CommonUtility_Linux_CMakeLists.txt Normal file
View file

@ -0,0 +1,11 @@
--- src/CommonUtility/Linux/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC
+++ src/CommonUtility/Linux/CMakeLists.txt
@@ -19,8 +19,6 @@ PROJECT(commonutility)
# プロジェクト名
PROJECT(commonutility)
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES=1)
-
# ビルドするためにインクルードするヘッダーファイルの場所
INCLUDE_DIRECTORIES(
../

22
graphics/epsonscan2/files/patch-src_Controller_CMakeFiles_epsonscan2.dir_DependInfo.cmake Normal file
View file

@ -0,0 +1,22 @@
--- src/Controller/CMakeFiles/epsonscan2.dir/DependInfo.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/Controller/CMakeFiles/epsonscan2.dir/DependInfo.cmake
@@ -82,9 +82,6 @@ set(CMAKE_C_COMPILER_ID "GNU")
set(CMAKE_C_COMPILER_ID "GNU")
# Preprocessor definitions for this target.
-set(CMAKE_TARGET_DEFINITIONS_C
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
- )
# The include file search paths:
set(CMAKE_C_TARGET_INCLUDE_PATH
@@ -177,9 +174,6 @@ set(CMAKE_CXX_COMPILER_ID "GNU")
set(CMAKE_CXX_COMPILER_ID "GNU")
# Preprocessor definitions for this target.
-set(CMAKE_TARGET_DEFINITIONS_CXX
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
- )
# The include file search paths:
set(CMAKE_CXX_TARGET_INCLUDE_PATH

18
graphics/epsonscan2/files/patch-src_Controller_CMakeFiles_epsonscan2.dir_flags.make Normal file
View file

@ -0,0 +1,18 @@
--- src/Controller/CMakeFiles/epsonscan2.dir/flags.make.orig 2024-09-12 07:10:30 UTC
+++ src/Controller/CMakeFiles/epsonscan2.dir/flags.make
@@ -5,13 +5,13 @@ C_FLAGS = -g -O0 -fPIC
# compile CXX with /usr/bin/c++
C_FLAGS = -g -O0 -fPIC
-C_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -Depsonscan2_EXPORTS
+C_DEFINES = -Depsonscan2_EXPORTS
C_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/Controller/.. -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Include -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Finder -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Scanner -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/ModelInfo -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Transfer -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/KeysValues -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/KeysValues/All -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Filter -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/FileFormat -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../../thirdparty/HaruPDF/include -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../../thirdparty/HaruPDF/zlib -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../CommonUtility/utils -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../CommonUtility -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../Include -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../Include/Controller -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../../thirdparty/sha1 -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/KeysValues/All/TextEnhance
CXX_FLAGS = -g -std=c++11 -O0 -fPIC
-CXX_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -Depsonscan2_EXPORTS
+CXX_DEFINES = -Depsonscan2_EXPORTS
CXX_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/Controller/.. -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Include -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Finder -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Scanner -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/ModelInfo -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Transfer -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/KeysValues -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/KeysValues/All -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/Filter -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/FileFormat -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../../thirdparty/HaruPDF/include -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../../thirdparty/HaruPDF/zlib -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../CommonUtility/utils -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../CommonUtility -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../Include -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../Include/Controller -I/home/build/shokaku/trunk/epsonscan2/src/Controller/../../thirdparty/sha1 -I/home/build/shokaku/trunk/epsonscan2/src/Controller/./Src/KeysValues/All/TextEnhance

13
graphics/epsonscan2/files/patch-src_Controller_CMakeLists.txt
View file

@ -1,6 +1,15 @@
--- src/Controller/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC --- src/Controller/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC
+++ src/Controller/CMakeLists.txt +++ src/Controller/CMakeLists.txt
@@ -171,21 +171,6 @@ ADD_LIBRARY(epsonscan2 SHARED @@ -24,8 +24,6 @@ PROJECT(epsonscan2)
PROJECT(epsonscan2)
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES=1)
-
INCLUDE_DIRECTORIES(
../
./Include
@@ -171,21 +169,6 @@ ADD_LIBRARY(epsonscan2 SHARED
../../thirdparty/HaruPDF/hpdf_exdata.c ../../thirdparty/HaruPDF/hpdf_exdata.c
../../thirdparty/HaruPDF/hpdf_encoder_utf.c ../../thirdparty/HaruPDF/hpdf_encoder_utf.c
@ -22,7 +31,7 @@
../../thirdparty/sha1/sha1.c ../../thirdparty/sha1/sha1.c
) )
@@ -194,7 +179,7 @@ target_link_libraries( epsonscan2 @@ -194,7 +177,7 @@ target_link_libraries( epsonscan2
dl dl
commonutility commonutility
${Boost_LIBRARIES} ${Boost_LIBRARIES}

10
graphics/epsonscan2/files/patch-src_Controller_Src_KeysValues_Key.hpp Normal file
View file

@ -0,0 +1,10 @@
--- src/Controller/Src/KeysValues/Key.hpp.orig 2024-09-12 07:10:34 UTC
+++ src/Controller/Src/KeysValues/Key.hpp
@@ -21,7 +21,6 @@
#include "EpsonScan2.h"
#include "KeyDataProvider.hpp"
#include <ESCommonTypedef.h>
-#define BOOST_NO_CXX11_RVALUE_REFERENCES 1
#include <boost/any.hpp>
#include <memory>
namespace epsonscan {

10
graphics/epsonscan2/files/patch-src_Controller_Src_KeysValues_KeyMgr.hpp Normal file
View file

@ -0,0 +1,10 @@
--- src/Controller/Src/KeysValues/KeyMgr.hpp.orig 2024-09-12 07:10:34 UTC
+++ src/Controller/Src/KeysValues/KeyMgr.hpp
@@ -18,7 +18,6 @@
#pragma once
-#define BOOST_NO_CXX11_RVALUE_REFERENCES 1
#include <ESCommonTypedef.h>
#include "EpsonScan2.h"
#include "KeyDataProvider.hpp"

22
graphics/epsonscan2/files/patch-src_ES2Command_Linux_CMakeFiles_es2command.dir_DependInfo.cmake Normal file
View file

@ -0,0 +1,22 @@
--- src/ES2Command/Linux/CMakeFiles/es2command.dir/DependInfo.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/ES2Command/Linux/CMakeFiles/es2command.dir/DependInfo.cmake
@@ -10,9 +10,6 @@ set(CMAKE_C_COMPILER_ID "GNU")
set(CMAKE_C_COMPILER_ID "GNU")
# Preprocessor definitions for this target.
-set(CMAKE_TARGET_DEFINITIONS_C
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
- )
# The include file search paths:
set(CMAKE_C_TARGET_INCLUDE_PATH
@@ -53,9 +50,6 @@ set(CMAKE_CXX_COMPILER_ID "GNU")
set(CMAKE_CXX_COMPILER_ID "GNU")
# Preprocessor definitions for this target.
-set(CMAKE_TARGET_DEFINITIONS_CXX
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
- )
# The include file search paths:
set(CMAKE_CXX_TARGET_INCLUDE_PATH

18
graphics/epsonscan2/files/patch-src_ES2Command_Linux_CMakeFiles_es2command.dir_flags.make Normal file
View file

@ -0,0 +1,18 @@
--- src/ES2Command/Linux/CMakeFiles/es2command.dir/flags.make.orig 2024-09-12 07:10:30 UTC
+++ src/ES2Command/Linux/CMakeFiles/es2command.dir/flags.make
@@ -5,13 +5,13 @@ C_FLAGS = -g -O0 -fPIC
# compile CXX with /usr/bin/c++
C_FLAGS = -g -O0 -fPIC
-C_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -Des2command_EXPORTS
+C_DEFINES = -Des2command_EXPORTS
C_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../../../thirdparty/rapidjson/include -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../.. -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../../Include/ES2Command -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../Src
CXX_FLAGS = -g -std=c++11 -Wno-multichar -O0 -fPIC
-CXX_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -Des2command_EXPORTS
+CXX_DEFINES = -Des2command_EXPORTS
CXX_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../../../thirdparty/rapidjson/include -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../.. -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../../Include/ES2Command -I/home/build/shokaku/trunk/epsonscan2/src/ES2Command/Linux/../Src

11
graphics/epsonscan2/files/patch-src_ES2Command_Linux_CMakeLists.txt
View file

@ -1,6 +1,15 @@
--- src/ES2Command/Linux/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC --- src/ES2Command/Linux/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC
+++ src/ES2Command/Linux/CMakeLists.txt +++ src/ES2Command/Linux/CMakeLists.txt
@@ -78,7 +78,7 @@ target_link_libraries( es2command @@ -19,8 +19,6 @@ PROJECT(es2command)
# プロジェクト名
PROJECT(es2command)
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES=1)
-
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
@@ -78,7 +76,7 @@ target_link_libraries( es2command
dl dl
commonutility commonutility
${Boost_LIBRARIES} ${Boost_LIBRARIES}

10
graphics/epsonscan2/files/patch-src_SaneWrapper_Linux_CMakeFiles_sane-epsonscan2.dir_DependInfo.cmake Normal file
View file

@ -0,0 +1,10 @@
--- src/SaneWrapper/Linux/CMakeFiles/sane-epsonscan2.dir/DependInfo.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/SaneWrapper/Linux/CMakeFiles/sane-epsonscan2.dir/DependInfo.cmake
@@ -17,7 +17,6 @@ set(CMAKE_TARGET_DEFINITIONS_CXX
# Preprocessor definitions for this target.
set(CMAKE_TARGET_DEFINITIONS_CXX
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
"BUILDSANE=1"
)

11
graphics/epsonscan2/files/patch-src_SaneWrapper_Linux_CMakeFiles_sane-epsonscan2.dir_flags.make Normal file
View file

@ -0,0 +1,11 @@
--- src/SaneWrapper/Linux/CMakeFiles/sane-epsonscan2.dir/flags.make.orig 2024-09-12 07:10:30 UTC
+++ src/SaneWrapper/Linux/CMakeFiles/sane-epsonscan2.dir/flags.make
@@ -4,7 +4,7 @@ CXX_FLAGS = -g -std=c++11 -O0 -fPIC
# compile CXX with /usr/bin/c++
CXX_FLAGS = -g -std=c++11 -O0 -fPIC
-CXX_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -DBUILDSANE=1 -Dsane_epsonscan2_EXPORTS
+CXX_DEFINES = -DBUILDSANE=1 -Dsane_epsonscan2_EXPORTS
CXX_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/SaneWrapper/Linux/.. -I/home/build/shokaku/trunk/epsonscan2/src/SaneWrapper/Linux/../.. -I/home/build/shokaku/trunk/epsonscan2/src/SaneWrapper/Linux/../../Standalone -I/home/build/shokaku/trunk/epsonscan2/src/SaneWrapper/Linux/../../bin -I/home/build/shokaku/trunk/epsonscan2/src/SaneWrapper/Linux/../../CommonUtility -I/home/build/shokaku/trunk/epsonscan2/src/SaneWrapper/Linux/../../CommonUtility/utils

11
graphics/epsonscan2/files/patch-src_SaneWrapper_Linux_CMakeLists.txt Normal file
View file

@ -0,0 +1,11 @@
--- src/SaneWrapper/Linux/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC
+++ src/SaneWrapper/Linux/CMakeLists.txt
@@ -19,8 +19,6 @@ PROJECT(sane-epsonscan2)
# プロジェクト名
PROJECT(sane-epsonscan2)
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES=1)
-
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)

12
graphics/epsonscan2/files/patch-src_ScanSDK_CMakeFiles_epsonscansdk.dir_DependInfo.cmake Normal file
View file

@ -0,0 +1,12 @@
--- src/ScanSDK/CMakeFiles/epsonscansdk.dir/DependInfo.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/ScanSDK/CMakeFiles/epsonscansdk.dir/DependInfo.cmake
@@ -17,9 +17,6 @@ set(CMAKE_CXX_COMPILER_ID "GNU")
set(CMAKE_CXX_COMPILER_ID "GNU")
# Preprocessor definitions for this target.
-set(CMAKE_TARGET_DEFINITIONS_CXX
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
- )
# The include file search paths:
set(CMAKE_CXX_TARGET_INCLUDE_PATH

11
graphics/epsonscan2/files/patch-src_ScanSDK_CMakeFiles_epsonscansdk.dir_flags.make Normal file
View file

@ -0,0 +1,11 @@
--- src/ScanSDK/CMakeFiles/epsonscansdk.dir/flags.make.orig 2024-09-12 07:10:30 UTC
+++ src/ScanSDK/CMakeFiles/epsonscansdk.dir/flags.make
@@ -4,7 +4,7 @@ CXX_FLAGS = -g -std=c++11 -O0 -fPIC
# compile CXX with /usr/bin/c++
CXX_FLAGS = -g -std=c++11 -O0 -fPIC
-CXX_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -Depsonscansdk_EXPORTS
+CXX_DEFINES = -Depsonscansdk_EXPORTS
CXX_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/ScanSDK -I/home/build/shokaku/trunk/epsonscan2/src/ScanSDK/.. -I/home/build/shokaku/trunk/epsonscan2/src/ScanSDK/../.. -I/home/build/shokaku/trunk/epsonscan2/src/ScanSDK/../../.. -I/home/build/shokaku/trunk/epsonscan2/src/ScanSDK/../Include -I/home/build/shokaku/trunk/epsonscan2/src/ScanSDK/../CommonUtility -I/home/build/shokaku/trunk/epsonscan2/src/ScanSDK/../CommonUtility/utils

11
graphics/epsonscan2/files/patch-src_ScanSDK_CMakeLists.txt Normal file
View file

@ -0,0 +1,11 @@
--- src/ScanSDK/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC
+++ src/ScanSDK/CMakeLists.txt
@@ -21,8 +21,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES=1)
-
INCLUDE_DIRECTORIES(
../
../../

11
graphics/epsonscan2/files/patch-src_ScanSDK_Src_SDK_SCANSDKsample__C++_CMakeLists.txt Normal file
View file

@ -0,0 +1,11 @@
--- src/ScanSDK/Src/SDK/SCANSDKsample_C++/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC
+++ src/ScanSDK/Src/SDK/SCANSDKsample_C++/CMakeLists.txt
@@ -28,8 +28,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES=1)
-
INCLUDE_DIRECTORIES(
)

10
graphics/epsonscan2/files/patch-src_Standalone_CMakeFiles_es2standalone.dir_DependInfo.cmake Normal file
View file

@ -0,0 +1,10 @@
--- src/Standalone/CMakeFiles/es2standalone.dir/DependInfo.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/Standalone/CMakeFiles/es2standalone.dir/DependInfo.cmake
@@ -117,7 +117,6 @@ set(CMAKE_TARGET_DEFINITIONS_CXX
# Preprocessor definitions for this target.
set(CMAKE_TARGET_DEFINITIONS_CXX
- "BOOST_NO_CXX11_RVALUE_REFERENCES=1"
"QT_CORE_LIB"
"QT_GUI_LIB"
"QT_WIDGETS_LIB"

11
graphics/epsonscan2/files/patch-src_Standalone_CMakeFiles_es2standalone.dir_flags.make Normal file
View file

@ -0,0 +1,11 @@
--- src/Standalone/CMakeFiles/es2standalone.dir/flags.make.orig 2024-09-12 07:10:30 UTC
+++ src/Standalone/CMakeFiles/es2standalone.dir/flags.make
@@ -4,7 +4,7 @@ CXX_FLAGS = -g -std=c++11 -O0 -fPIC
# compile CXX with /usr/bin/c++
CXX_FLAGS = -g -std=c++11 -O0 -fPIC
-CXX_DEFINES = -DBOOST_NO_CXX11_RVALUE_REFERENCES=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB
+CXX_DEFINES = -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB
CXX_INCLUDES = -I/home/build/shokaku/trunk/epsonscan2/src/Standalone -I/home/build/shokaku/trunk/epsonscan2/src/Standalone/.. -I/home/build/shokaku/trunk/epsonscan2/src/Standalone/../.. -I/home/build/shokaku/trunk/epsonscan2/src/Standalone/../../.. -I/home/build/shokaku/trunk/epsonscan2/src/Standalone/../Include -I/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility -I/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility/utils -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -isystem /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64

11
graphics/epsonscan2/files/patch-src_Standalone_CMakeFiles_es2standalone__automoc.dir_AutogenInfo.cmake Normal file
View file

@ -0,0 +1,11 @@
--- src/Standalone/CMakeFiles/es2standalone_automoc.dir/AutogenInfo.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/Standalone/CMakeFiles/es2standalone_automoc.dir/AutogenInfo.cmake
@@ -4,7 +4,7 @@ set(AM_HEADERS "" )
set(AM_SKIP_MOC "" )
set(AM_SKIP_UIC "" )
set(AM_HEADERS "" )
-set(AM_MOC_COMPILE_DEFINITIONS "BOOST_NO_CXX11_RVALUE_REFERENCES=1;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB")
+set(AM_MOC_COMPILE_DEFINITIONS "QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB")
set(AM_MOC_INCLUDES "/home/build/shokaku/trunk/epsonscan2/src/Standalone;/home/build/shokaku/trunk/epsonscan2/src/Standalone/..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../../..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../Include;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility/utils;/usr/include/x86_64-linux-gnu/qt5;/usr/include/x86_64-linux-gnu/qt5/QtWidgets;/usr/include/x86_64-linux-gnu/qt5/QtGui;/usr/include/x86_64-linux-gnu/qt5/QtCore;/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64;/usr/include")
set(AM_MOC_OPTIONS "")
set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE "")

5
graphics/epsonscan2/files/patch-src_Standalone_CMakeFiles_es2standalone__automoc.dir_AutomocOldMocDefinitions.cmake Normal file
View file

@ -0,0 +1,5 @@
--- src/Standalone/CMakeFiles/es2standalone_automoc.dir/AutomocOldMocDefinitions.cmake.orig 2024-09-12 07:10:30 UTC
+++ src/Standalone/CMakeFiles/es2standalone_automoc.dir/AutomocOldMocDefinitions.cmake
@@ -1 +1 @@
-set(AM_OLD_COMPILE_SETTINGS "BOOST_NO_CXX11_RVALUE_REFERENCES=1;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB ~~~ /home/build/shokaku/trunk/epsonscan2/src/Standalone;/home/build/shokaku/trunk/epsonscan2/src/Standalone/..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../../..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../Include;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility/utils;/usr/include/x86_64-linux-gnu/qt5;/usr/include/x86_64-linux-gnu/qt5/QtWidgets;/usr/include/x86_64-linux-gnu/qt5/QtGui;/usr/include/x86_64-linux-gnu/qt5/QtCore;/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64;/usr/include ~~~ ~~~ FALSE ~~~ ")
+set(AM_OLD_COMPILE_SETTINGS "QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB ~~~ /home/build/shokaku/trunk/epsonscan2/src/Standalone;/home/build/shokaku/trunk/epsonscan2/src/Standalone/..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../../..;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../Include;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility;/home/build/shokaku/trunk/epsonscan2/src/Standalone/../CommonUtility/utils;/usr/include/x86_64-linux-gnu/qt5;/usr/include/x86_64-linux-gnu/qt5/QtWidgets;/usr/include/x86_64-linux-gnu/qt5/QtGui;/usr/include/x86_64-linux-gnu/qt5/QtCore;/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64;/usr/include ~~~ ~~~ FALSE ~~~ ")

11
graphics/epsonscan2/files/patch-src_Standalone_CMakeLists.txt
View file

@ -1,6 +1,15 @@
--- src/Standalone/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC --- src/Standalone/CMakeLists.txt.orig 2024-09-12 07:10:30 UTC
+++ src/Standalone/CMakeLists.txt +++ src/Standalone/CMakeLists.txt
@@ -167,5 +167,5 @@ QT5_USE_MODULES(es2standalone Widgets) @@ -28,8 +28,6 @@ find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Widgets REQUIRED)
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES=1)
-
INCLUDE_DIRECTORIES(
../
../../
@@ -167,5 +165,5 @@ QT5_USE_MODULES(es2standalone Widgets)
) )
QT5_USE_MODULES(es2standalone Widgets) QT5_USE_MODULES(es2standalone Widgets)

10
graphics/epsonscan2/files/patch-src_Standalone_defaultsettings.cpp Normal file
View file

@ -0,0 +1,10 @@
--- src/Standalone/defaultsettings.cpp.orig 2024-09-12 07:10:39 UTC
+++ src/Standalone/defaultsettings.cpp
@@ -18,7 +18,6 @@
#include "defaultsettings.h"
#include <fstream>
-#define BOOST_NO_CXX11_RVALUE_REFERENCES 1
#include <boost/any.hpp>
#include <utils/PathUtils.h>
#if !(defined(NO_QTMODE) || defined(BUILDSANE))

10
graphics/epsonscan2/files/patch-src_Standalone_lastusedsettings.cpp Normal file
View file

@ -0,0 +1,10 @@
--- src/Standalone/lastusedsettings.cpp.orig 2024-09-12 07:10:41 UTC
+++ src/Standalone/lastusedsettings.cpp
@@ -17,7 +17,6 @@
// lastusedsettings.cpp -- template and derived ESC/I ESC/I-2 protocol commands
#include <fstream>
-#define BOOST_NO_CXX11_RVALUE_REFERENCES 1
#include <boost/any.hpp>
#include <utils/PathUtils.h>
#ifndef NO_QTMODE