diff options
9 files changed, 30 insertions, 9 deletions
diff --git a/dev-python/sip4-tqt/sip4-tqt-14.1.1.ebuild b/dev-python/sip4-tqt/sip4-tqt-14.1.1.ebuild index a2e51109..0708a71e 100644 --- a/dev-python/sip4-tqt/sip4-tqt-14.1.1.ebuild +++ b/dev-python/sip4-tqt/sip4-tqt-14.1.1.ebuild @@ -37,7 +37,7 @@ src_configure() { -b "${TDEDIR}/bin" -e "${TDEDIR}/include" ) - echo yes | "${EPYTHON}" configure.py "${myconf[@]}" CFLAGS="${CFLAGS}" || die + echo yes | "${EPYTHON}" configure.py "${myconf[@]}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}" || die } src_compile() { diff --git a/dev-python/sip4-tqt/sip4-tqt-14.1.2.ebuild b/dev-python/sip4-tqt/sip4-tqt-14.1.2.ebuild index d714d308..10a7f524 100644 --- a/dev-python/sip4-tqt/sip4-tqt-14.1.2.ebuild +++ b/dev-python/sip4-tqt/sip4-tqt-14.1.2.ebuild @@ -37,7 +37,7 @@ src_configure() { -b "${TDEDIR}/bin" -e "${TDEDIR}/include" ) - echo yes | "${EPYTHON}" configure.py "${myconf[@]}" CFLAGS="${CFLAGS}" || die + echo yes | "${EPYTHON}" configure.py "${myconf[@]}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}" || die } src_compile() { diff --git a/dev-python/sip4-tqt/sip4-tqt-9999.ebuild b/dev-python/sip4-tqt/sip4-tqt-9999.ebuild index a2e51109..0708a71e 100644 --- a/dev-python/sip4-tqt/sip4-tqt-9999.ebuild +++ b/dev-python/sip4-tqt/sip4-tqt-9999.ebuild @@ -37,7 +37,7 @@ src_configure() { -b "${TDEDIR}/bin" -e "${TDEDIR}/include" ) - echo yes | "${EPYTHON}" configure.py "${myconf[@]}" CFLAGS="${CFLAGS}" || die + echo yes | "${EPYTHON}" configure.py "${myconf[@]}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}" || die } src_compile() { diff --git a/trinity-apps/piklab/piklab-9999.ebuild b/trinity-apps/piklab/piklab-9999.ebuild index 9bc83a63..d4828169 100644 --- a/trinity-apps/piklab/piklab-9999.ebuild +++ b/trinity-apps/piklab/piklab-9999.ebuild @@ -6,8 +6,7 @@ EAPI="8" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" -TRINITY_LANGS="cs de es fr hu it" -TRINITY_BUILD_ADMIN="yes" +TRINITY_LANGS="cs de es fr hu it ru" TRINITY_MODULE_TYPE="applications/development" inherit trinity-base-2 @@ -21,5 +20,8 @@ if [[ ${PV} != *9999* ]] ; then fi src_configure() { - trinity-econf --disable-final + local mycmakeargs=( + -DBUILD_TRANSLATIONS=ON + ) + trinity-base-2_src_configure } diff --git a/trinity-base/tdegraphics-tdefile-plugins/files/tdegraphics-tdefile-plugins-poppler-cxx20.patch b/trinity-base/tdegraphics-tdefile-plugins/files/tdegraphics-tdefile-plugins-poppler-cxx20.patch new file mode 100755 index 00000000..48059864 --- /dev/null +++ b/trinity-base/tdegraphics-tdefile-plugins/files/tdegraphics-tdefile-plugins-poppler-cxx20.patch @@ -0,0 +1,12 @@ +--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake 2024-08-08 09:26:10.425644153 +0300 ++++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake 2024-08-08 09:26:47.997642582 +0300 +@@ -14,6 +14,8 @@ + math( EXPR POPPLER_VERSION_C "(${POPPLER_VERSION_MAJOR}*1000000) + (${POPPLER_VERSION_MINOR}*1000) + ${POPPLER_VERSION_PATCH}" ) + set( POPPLER_VERSION_C ${POPPLER_VERSION_C} CACHE INTERNAL "Poppler library version as code number" ) + +-if( NOT POPPLER_VERSION_C LESS 21012000 ) ++if( NOT POPPLER_VERSION_C LESS 24004000 ) ++ set( POPPLER_CXX_FEATURES cxx_std_20 CACHE INTERNAL "C++ standard required by Poppler" ) ++elseif( NOT POPPLER_VERSION_C LESS 21012000 ) + set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" ) + endif() diff --git a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild index 76836f2a..37dc9a2e 100644 --- a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild +++ b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild @@ -21,6 +21,10 @@ DEPEND=" pdf? ( app-text/poppler )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-poppler-cxx20.patch" +) + src_configure() { local mycmakeargs=( -DWITH_TIFF="$(usex tiff)" diff --git a/trinity-base/twin/twin-14.1.1.ebuild b/trinity-base/twin/twin-14.1.1.ebuild index b0dafa22..e506b8c7 100644 --- a/trinity-base/twin/twin-14.1.1.ebuild +++ b/trinity-base/twin/twin-14.1.1.ebuild @@ -17,7 +17,8 @@ IUSE="xcomposite xrandr xinerama +libconfig +pcre opengl" DEPEND="x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender - xcomposite? ( x11-libs/libXcomposite ) + xcomposite? ( x11-libs/libXcomposite + x11-libs/libXdamage ) xinerama? ( x11-base/xorg-proto ) xrandr? ( x11-libs/libXrandr ) libconfig? ( dev-libs/libconfig ) diff --git a/trinity-base/twin/twin-14.1.2.ebuild b/trinity-base/twin/twin-14.1.2.ebuild index efbbbdb9..13acb0c3 100644 --- a/trinity-base/twin/twin-14.1.2.ebuild +++ b/trinity-base/twin/twin-14.1.2.ebuild @@ -17,7 +17,8 @@ IUSE="xcomposite xrandr xinerama +libconfig +pcre opengl" DEPEND="x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender - xcomposite? ( x11-libs/libXcomposite ) + xcomposite? ( x11-libs/libXcomposite + x11-libs/libXdamage ) xinerama? ( x11-base/xorg-proto ) xrandr? ( x11-libs/libXrandr ) libconfig? ( dev-libs/libconfig ) diff --git a/trinity-base/twin/twin-9999.ebuild b/trinity-base/twin/twin-9999.ebuild index 032a6c71..a8104a72 100644 --- a/trinity-base/twin/twin-9999.ebuild +++ b/trinity-base/twin/twin-9999.ebuild @@ -18,7 +18,8 @@ IUSE="xcomposite xrandr xinerama +libconfig +pcre opengl" DEPEND="x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender - xcomposite? ( x11-libs/libXcomposite ) + xcomposite? ( x11-libs/libXcomposite + x11-libs/libXdamage ) xinerama? ( x11-base/xorg-proto ) xrandr? ( x11-libs/libXrandr ) libconfig? ( dev-libs/libconfig ) |