Updates 12 September 2022 ...

gtk-qt-engine - include docs and translations for development builds
 various misc builds versions
master
Ray-V 2 years ago
parent 205b1f604e
commit 7c0d24fef7

@ -57,7 +57,7 @@ chown_fn
cd_builddir_fn cd_builddir_fn
# If mp4v2 is installed, use mp4 metadata sources in build, otherwise m4a is used .. # If mp4v2 is installed, use mp4 metadata sources in build, otherwise m4a is used ..
[[ -s /usr/include/mp4v2/mp4v2.h ]] && MP4V2="ON" pkg-config mp4v2 && MP4V2="ON"
## Build xine-engine? ## Build xine-engine?
[[ -s /usr/include/xine.h ]] && XINE="ON" [[ -s /usr/include/xine.h ]] && XINE="ON"

@ -33,13 +33,21 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && {
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
# but only for languages available with this package # but only for languages available with this package
langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/gtkqtengine.po";done langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/gtkqtengine.po";done
sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt
langs=$(echo $langs|sed "s|/gtkqtengine.po||g") [[ $langs ]] && langs=" $(echo $langs|sed "s|/gtkqtengine.po||g")"
## There is no BUILD_TRANSLATIONS option for this build ## There is no BUILD_TRANSLATIONS option for this build
## [[ $langs != "" ]] && TRANS=ON ## [[ $langs != "" ]] && TRANS=ON
} || {
## for slack-desc
langs=""
for Lang in $I18N
do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang"
done
}
listdocs_fn listdocs_fn
@ -47,6 +55,12 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add [empty]docs & translations for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
BUILDDOC=-DBUILD_DOC="ON"
TRANS=-DBUILD_TRANSLATIONS="ON"
}
## BONOBO will be included in the build if installed ## BONOBO will be included in the build if installed
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -57,6 +71,8 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${BUILDDOC:-} \
${TRANS:-} \
-Wno-dev \ -Wno-dev \
.. ..
@ -85,7 +101,7 @@ $PRGNAM: Styles and Fonts' section in the TDE control center and select
$PRGNAM: 'Use my TDE style in GTK applications'. $PRGNAM: 'Use my TDE style in GTK applications'.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: en$langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -1,8 +1,5 @@
klamav needs clamav as a build time requirement klamav needs clamav as a build time requirement
Download from: Download from:
https://www.clamav.net/downloads/production/clamav-0.104.3.tar.gz https://www.clamav.net/downloads/production/clamav-0.105.1.tar.gz
If using wget, include a user agent otherwise '403 Forbidden' is returned.
For example, wget --user-agent='Mozilla'

@ -33,7 +33,7 @@ source ../../get-source.sh
## klamav needs clamav as a build time requirement ## klamav needs clamav as a build time requirement
[[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && { [[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && {
# ### clamav - start # ### clamav - start
clamav_VERS=0.104.3 clamav_VERS=0.105.1
clamav_installed_fn () { pkg-config libclamav ;} clamav_installed_fn () { pkg-config libclamav ;}
## If it's already installed, go to end ## If it's already installed, go to end
clamav_installed_fn || { clamav_installed_fn || {
@ -69,10 +69,18 @@ cmake ${G_NINJA:-} \
-DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DMAINTAINER_MODE="OFF" \
-DENABLE_APP="ON" \
-DENABLE_MILTER=${MILTER:-"OFF"} \
-DENABLE_CLAMONACC="ON" \
-DENABLE_EXAMPLES="OFF" \
-DENABLE_TESTS="ON" \
-DENABLE_MAN_PAGES="ON" \ -DENABLE_MAN_PAGES="ON" \
-DCMAKE_INSTALL_MANDIR=/usr/local/man \ -DENABLE_DOXYGEN="OFF" \
-DENABLE_UNRAR="ON" \
-DENABLE_SYSTEMD="OFF" \ -DENABLE_SYSTEMD="OFF" \
-DENABLE_MILTER=${MILTER:-"OFF"} \ -DENABLE_JSON_SHARED="ON" \
-DCMAKE_INSTALL_MANDIR=/usr/local/man \
-Wno-dev \ -Wno-dev \
.. ..
@ -98,10 +106,10 @@ echo -e "
clamav is required for building klamav clamav is required for building klamav
Download [including user-agent, otherwise '403 Forbidden' is returned]: Download:
\033[39;1m \033[39;1m
( cd $BUILD_TDE_ROOT/src ( cd $BUILD_TDE_ROOT/src
wget --user-agent='Mozilla' https://www.clamav.net/downloads/production/clamav-$clamav_VERS.tar.gz ) wget https://www.clamav.net/downloads/production/clamav-$clamav_VERS.tar.gz )
\033[0m \033[0m
and re-run this script .. and re-run this script ..

@ -377,7 +377,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 Optional build-time dependencies -> akode + tdemultimedia \Zn" \ "Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 Optional build-time dependencies -> akode + tdemultimedia \Zn" \
"Core/tdeadmin" "System admin packages" off "\Zb\Z6 \Zn" \ "Core/tdeadmin" "System admin packages" off "\Zb\Z6 \Zn" \
"Core/tdeartwork" "Extra artwork/themes/wallpapers for TDE" off "\Zb\Z6 \Zn" \ "Core/tdeartwork" "Extra artwork/themes/wallpapers for TDE" off "\Zb\Z6 \Zn" \
" Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Runtime option for kscope. pdf/html docs not built by default \Zn" \ " Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Runtime option for kscope. pdf/html docs not installed by default \Zn" \
"Core/tdeedu" "Educational software" off "\Zb\Z6 Build-time option -> dot [graphviz] \Zn" \ "Core/tdeedu" "Educational software" off "\Zb\Z6 Build-time option -> dot [graphviz] \Zn" \
"Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \ "Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \
" Misc/imlib" "An image loading and rendering library" off "\Zb\Z6 Build-time option for tdegraphics - needed for kuickshow \Zn" \ " Misc/imlib" "An image loading and rendering library" off "\Zb\Z6 Build-time option for tdegraphics - needed for kuickshow \Zn" \
@ -981,7 +981,6 @@ TDE version \Zb\Z6$TDEVERSION\Zn
Clone/update cgit local repositories \Zb\Z6${CLONE:-\Z0\Zbn/a}\Zn Clone/update cgit local repositories \Zb\Z6${CLONE:-\Z0\Zbn/a}\Zn
Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbn/a}\Zn Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbn/a}\Zn
TDE installation directory \Zb\Z6$INSTALL_TDE\Zn TDE installation directory \Zb\Z6$INSTALL_TDE\Zn
TDE system configuration directory \Zb\Z6$TDE_CNF_DIR\Zn
Compiler \Zb\Z6$COMPILER\Zn Compiler \Zb\Z6$COMPILER\Zn
gcc cpu optimization \Zb\Z6$SET_march\Zn gcc cpu optimization \Zb\Z6$SET_march\Zn
Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn

@ -11,6 +11,6 @@ gts is an optional dependency.
------------------------------ ------------------------------
pdf and html documentation is not built by default. pdf and html documentation is not installed by default.
To build it, use the GVZ_DOCS=1 command line option as detailed in the SlackBuild. To install it, use the GVZ_DOCS=y command line option as detailed in the SlackBuild.

@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=graphviz PRGNAM=graphviz
VERSION=2.50.0 VERSION=5.0.1
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-} TAG=${TAG:-}
@ -42,7 +42,7 @@ untar_fn
patch -p0 << EOF patch -p0 << EOF
--- plugin/gs/gvloadimage_gs.c --- plugin/gs/gvloadimage_gs.c
+++ plugin/gs/gvloadimage_gs.c +++ plugin/gs/gvloadimage_gs.c
@@ -74,11 +74,11 @@ @@ -77,11 +77,11 @@
assert (err < 0); assert (err < 0);
@ -73,17 +73,22 @@ patch -p0 << EOF
EOF EOF
## The primary purpose of this build is for 'dot' for kscope, tdeedu, ... ## The primary purpose of this build is for 'dot' for kscope, tdeedu, ...
## To include the pdf and html documentation, build with 'GVZ_DOCS=1 ./BUILD-TDE.sh' ## To include the pdf and html documentation, build with 'GVZ_DOCS=y ./BUILD-TDE.sh'
[[ ! ${GVZ_DOCS:-} ]] && { [[ ${GVZ_DOCS:-} != [yY1] ]] && {
patch -p0 << EOF patch -p0 << EOF
--- Makefile.in --- Makefile.in
+++ Makefile.in +++ Makefile.in
@@ -623 +623 @@ @@ -614 +614 @@
-SUBDIRS = \$(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests -SUBDIRS = \$(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests
+SUBDIRS = \$(subdirs) lib plugin cmd tclpkg contrib share graphs rtest tests +SUBDIRS = \$(subdirs) lib plugin cmd tclpkg contrib share graphs tests
EOF EOF
sed -i '/tcldot.html/d' tclpkg/tcldot/Makefile.in sed -i '/tcldot.html/d' tclpkg/tcldot/Makefile.in
} }
## relevant if including docs, but not installed otherwise
sed -i 's|../doc/||;28,54s|../pdf/|../../../man/man1/|;58,71s|../pdf/|../../../man/man3/|;28,71s|\.pdf|\.gz|' doc/index.html
sed -i '56,62d;s|pages (PDF)|pages|' doc/index.html
sed -i '/dotty/d;/lefty/d;/circo/d;/fdp/d;/gv2gxl/d;/neato\.1/d;/twopi/d;/\/graph/d' doc/index.html
sed -i 's|libguide.*$|&\n <li><a href="Agraph.pdf">cgraph tutorial</a>|' doc/index.html
listdocs_fn listdocs_fn
@ -99,6 +104,7 @@ CXX=$COMPILER_CXX \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \ --libdir=/usr/lib$LIBDIRSUFFIX \
--mandir=/usr/man \ --mandir=/usr/man \
--enable-man-pdfs=no \
--enable-ocaml=no --enable-ocaml=no
make_fn make_fn

@ -21,11 +21,11 @@
# SUCH DAMAGE. # SUCH DAMAGE.
PRGNAM=imlib2 PRGNAM=imlib2
VERSION=1.7.1 VERSION=1.9.1
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-} TAG=${TAG:-}
ARCHIVE_TYPE="tar.bz2" ARCHIVE_TYPE="tar.xz"
SRCURL="https://sourceforge.net/projects/enlightenment/files/$PRGNAM-src/$VERSION/$PRGNAM-$VERSION.$ARCHIVE_TYPE" SRCURL="https://sourceforge.net/projects/enlightenment/files/$PRGNAM-src/$VERSION/$PRGNAM-$VERSION.$ARCHIVE_TYPE"
source ../../get-source.sh source ../../get-source.sh
@ -43,21 +43,20 @@ cd_builddir_fn
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
../configure \ ../configure \
--prefix=/usr \ --prefix=/usr/local \
--libdir=/usr/lib$LIBDIRSUFFIX \ --libdir=/usr/local/lib$LIBDIRSUFFIX \
--enable-doc-build \
--disable-static --disable-static
make_fn make_fn
INSTALL_TDE=/usr/local
installdocs_fn installdocs_fn
cp ../doc/{*.html,*.gif} $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION ## index.html should be created during the build
sed -i 's|BGCOLOR="#6a7a8a"|BGCOLOR="#edeaff"|' $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/index.html [[ -s doc/html/index.html ]] && cp doc/html/{index.html,imlib2_logo.png} $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION
#INSTALL_TDE=/usr rm -f $PKG/$INSTALL_TDE/lib${LIBDIRSUFFIX}/*.la
#mangzip_fn rm -f $PKG/$INSTALL_TDE/lib${LIBDIRSUFFIX}/*/*/*.la
rm -rf $PKG/$INSTALL_TDE/lib${LIBDIRSUFFIX}/*.la
rm -rf $PKG/$INSTALL_TDE/lib${LIBDIRSUFFIX}/*/*/*.la
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn
@ -80,7 +79,7 @@ $PRGNAM: * Apply filters to images
$PRGNAM: * Scale images $PRGNAM: * Scale images
$PRGNAM: * Apply color correction .. and more $PRGNAM: * Apply color correction .. and more
$PRGNAM: $PRGNAM:
$PRGNAM: See /usr/doc/$PRGNAM-$VERSION/index.html for the full list. $PRGNAM: See /usr/local/doc/$PRGNAM-$VERSION/index.html for the full list.
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -3,7 +3,7 @@ Inkscape v1 requires the non-Slackware package double-conversion.
The source will need to be pre-downloaded and placed in the 'src' directory and will then be built, packaged, and installed during the inkscape build. The source will need to be pre-downloaded and placed in the 'src' directory and will then be built, packaged, and installed during the inkscape build.
Download from: Download from:
https://github.com/google/double-conversion/archive/v3.2.0.tar.gz https://github.com/google/double-conversion/archive/v3.2.1.tar.gz
The URL will be displayed when running the SlackBuild if the installation or source isn't found. The URL will be displayed when running the SlackBuild if the installation or source isn't found.

@ -41,15 +41,15 @@ getsource_fn
## If it is already installed, go to end ## If it is already installed, go to end
pkg-config double-conversion || ldconfig -p|grep libdouble-conversion 1>/dev/null || { # ldconfig if no .pc file pkg-config double-conversion || ldconfig -p|grep libdouble-conversion 1>/dev/null || { # ldconfig if no .pc file
## otherwise, if the source archive is in 'src' .. ## otherwise, if the source archive is in 'src' ..
[[ -s $BUILD_TDE_ROOT/src/v3.2.0.tar.gz ]] && { [[ -s $BUILD_TDE_ROOT/src/v3.2.1.tar.gz ]] && {
## .. build, package, and install .. ## .. build, package, and install ..
( (
echo -e "\n building double-conversion \n" echo -e "\n building double-conversion \n"
cd /$TMP_BUILD cd /$TMP_BUILD
rm -rf *double-conversion* rm -rf *double-conversion*
tar xf $BUILD_TDE_ROOT/src/v3.2.0.tar.gz tar xf $BUILD_TDE_ROOT/src/v3.2.1.tar.gz
cd double-conversion-3.2.0/ cd double-conversion-3.2.1/
## add a pkg-config .pc file ## add a pkg-config .pc file
echo 'prefix=@CMAKE_INSTALL_PREFIX@ echo 'prefix=@CMAKE_INSTALL_PREFIX@
@ -66,15 +66,13 @@ Libs: -L${libdir} -l@PROJECT_NAME@
Cflags: -I${includedir}/@PROJECT_NAME@ Cflags: -I${includedir}/@PROJECT_NAME@
' > double-conversion.pc.in ' > double-conversion.pc.in
# #
patch -p0 << EOF echo '
--- CMakeLists.txt configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in
+++ CMakeLists.txt ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY )
@@ -118,0 +119,4 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ ' >> CMakeLists.txt
+configure_file( \${CMAKE_CURRENT_SOURCE_DIR}/\${PROJECT_NAME}.pc.in
+ \${CMAKE_CURRENT_BINARY_DIR}/\${PROJECT_NAME}.pc @ONLY IMMEDIATE ) sed -i 's|VERSION 3.2.0|VERSION 3.2.1|' CMakeLists.txt
+install(FILES "\${CMAKE_CURRENT_BINARY_DIR}/\${PROJECT_NAME}.pc" DESTINATION \${CMAKE_INSTALL_LIBDIR}/pkgconfig)
EOF
cd cmake/ cd cmake/
# LIBDIRSUFFIX not required - builds to lib64 where appropriate .. # LIBDIRSUFFIX not required - builds to lib64 where appropriate ..
@ -89,8 +87,8 @@ PKG=$TMP_BUILD/package-double-conversion
make_fn make_fn
cd $TMP_BUILD/package-double-conversion cd $TMP_BUILD/package-double-conversion
makepkg -l y -c n $OUTPUT/double-conversion-3.2.0-$ARCH-$BUILD.txz makepkg -l y -c n $OUTPUT/double-conversion-3.2.1-$ARCH-$BUILD.txz
installpkg $OUTPUT/double-conversion-3.2.0-$ARCH-$BUILD.txz installpkg $OUTPUT/double-conversion-3.2.1-$ARCH-$BUILD.txz
) )
echo -e "\n now building inkscape \n" echo -e "\n now building inkscape \n"
} || { ## .. but if the source archive isn't in 'src', display download URL .. } || { ## .. but if the source archive isn't in 'src', display download URL ..
@ -102,7 +100,7 @@ echo -e "
Download: Download:
\033[39;1m \033[39;1m
( cd $BUILD_TDE_ROOT/src ( cd $BUILD_TDE_ROOT/src
wget https://github.com/google/double-conversion/archive/v3.2.0.tar.gz ) wget https://github.com/google/double-conversion/archive/v3.2.1.tar.gz )
\033[0m \033[0m
and re-run this script .. and re-run this script ..
@ -119,54 +117,36 @@ untar_fn
sed -i 's|set(CMAKE_INSTALL_RPATH.*$|set(CMAKE_INSTALL_RPATH $ORIGIN)|' src/3rdparty/2geom/CMakeLists.txt sed -i 's|set(CMAKE_INSTALL_RPATH.*$|set(CMAKE_INSTALL_RPATH $ORIGIN)|' src/3rdparty/2geom/CMakeLists.txt
sed -i "s|libdir=.*$|&$LIBDIRSUFFIX|" src/3rdparty/2geom/2geom.pc.in sed -i "s|libdir=.*$|&$LIBDIRSUFFIX|" src/3rdparty/2geom/2geom.pc.in
## only build for required locales ### only build for required locales
{ ## .. for translations and slack-desc
## set up a directory to store the required locale files temporarily locas=""
TEMP_DIR=$TMP_BUILD/tmp-$PRGNAM/loc_tmp
mkdir $TEMP_DIR
## .. for po/LINGUAS
LOCALES=$(cat po/LINGUAS)
rm po/LINGUAS
for locale in $I18N
do
[[ $LOCALES == *$locale* ]] && \
echo $locale >> po/LINGUAS
done
## .. for translations
locas="" ## for slack-desc
for locale in $I18N
do
mv po/$locale.po $TEMP_DIR && locas="$locas $locale"
done
rm -rf po/*.po
mv $TEMP_DIR/* po/
## .. for tutorials ## .. for tutorials
tuts="tutorial-tracing.svg tutorial-tracing-pixelart.svg tutorial-tips.svg tutorial-shapes.svg tutorial-interpolate.svg tutorial-elements.svg tutorial-calligraphy.svg tutorial-basic.svg tutorial-advanced.svg tux.png potrace.png pixelart-dialog.png oldguitar.jpg making_markers.svg edge3d.svg"
## .. for man pages
pods="inkscape.pod.in inkview.pod.in"
## .. for welcome screen text
I18N_SVG="about.svg start-welcome-text.svg"
#
for locale in $I18N for locale in $I18N
do do
mv share/tutorials/*.$locale.* $TEMP_DIR locas="$locas $locale"
tuts="$tuts $(ls share/tutorials/*.$locale.*)" || true
pods="$pods $(ls man/*.$locale.pod.in)" || true
[[ -s share/screens/start-welcome-text.$locale.svg ]] && I18N_SVG="$I18N_SVG start-welcome-text.$locale.svg" && COUNT_TEXT=$[${COUNT_TEXT:-}+1]
COUNT_I18N=$[${COUNT_I18N:-}+1]
done done
rm share/tutorials/*.*.*
mv $TEMP_DIR/* share/tutorials/
} || true # because the existence of the files hasn't been tested
## only package man pages for required locales
for file in man/ink*.*.pod.in
do
[[ $I18N != *$(echo $file | cut -d"." -f2)* ]] && rm $file
done
## and install them to $prefix, as per most other Slackware packages
sed -i 's|MANFILE_DEST "${SHARE_INSTALL}|MANFILE_DEST "${CMAKE_INSTALL_PREFIX}|' CMakeScripts/Pod2man.cmake
## only package welcome screen text for required locales
I18N_SVG="about.svg start-welcome-text.svg"
# #
for Loc in $I18N pos=$(echo $locas | sed 's| |.po |g;s|$|.po|')
do sed -i "s|*.po|$pos|" po/CMakeLists.txt
[[ -s share/screens/start-welcome-text.$Loc.svg ]] && I18N_SVG="$I18N_SVG start-welcome-text.$Loc.svg" && COUNT_TEXT=$[${COUNT_TEXT:-}+1] #
COUNT_I18N=$[${COUNT_I18N:-}+1] tuts=$(echo $tuts|sed 's|share/tutorials/||g')
done sed -i "s|GLOB.*$|GLOB _FILES README $tuts)|" share/tutorials/CMakeLists.txt
#
pods=$(echo $pods|sed 's|man/||g')
sed -i "s|*.pod.in|$pods|" man/CMakeLists.txt
## and install man pages to $prefix, as per most other Slackware packages
sed -i 's|MANFILE_DEST "${CMAKE_INSTALL_FULL_MANDIR}|MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/man|' CMakeScripts/Pod2man.cmake
#
## Add the TRANSLATING file if any of the locales has no start-welcome-text.$I18N.svg ## Add the TRANSLATING file if any of the locales has no start-welcome-text.$I18N.svg
[[ ${COUNT_I18N:-} != ${COUNT_TEXT:-} ]] && I18N_SVG="TRANSLATING $I18N_SVG" [[ ${COUNT_I18N:-} != ${COUNT_TEXT:-} ]] && I18N_SVG="TRANSLATING $I18N_SVG"
sed -i "s|\"\*.svg\"|$I18N_SVG|" share/screens/CMakeLists.txt sed -i "s|\"\*.svg\"|$I18N_SVG|" share/screens/CMakeLists.txt

@ -0,0 +1,4 @@
Man pages aren't available with this version of mp4v2.
Identical information for the binaries can be seen by running them from a console with or without the '--help' option.

@ -24,27 +24,24 @@
# SUCH DAMAGE. # SUCH DAMAGE.
PRGNAM=mp4v2 PRGNAM=mp4v2
VERSION=2.0.0 VERSION=2.1.1
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-} TAG=${TAG:-}
ARCHIVE_TYPE="tar.bz2" ARCHIVE_TYPE="tar.gz"
SRCURL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PRGNAM}/${PRGNAM}-${VERSION}.$ARCHIVE_TYPE" SRCURL="https://github.com/enzo1982/$PRGNAM/archive/v$VERSION.$ARCHIVE_TYPE"
source ../../get-source.sh source ../../get-source.sh
getsource_fn getsource_fn
untar_fn untar_fn
## patch for gcc7 ../src/rtphint.cpp:342:35: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]
sed -i "s|(pSlash != '|(*pSlash != '|" src/rtphint.cpp
## patch for gcc10 - error: narrowing conversion of mp4v2::util::SubtitleUtility::LC_LIST from unsigned int to int, etc.. ## patch for gcc10 - error: narrowing conversion of mp4v2::util::SubtitleUtility::LC_LIST from unsigned int to int, etc..
## thanks to https://bugs.gentoo.org/723098 ## thanks to https://bugs.gentoo.org/723098
patch -N -p0 << EOF || true patch -N -p0 << EOF || true
--- libutil/Utility.cpp --- libutil/Utility.cpp
+++ libutil/Utility.cpp +++ libutil/Utility.cpp
@@ -496,1 +496,1 @@ @@ -492,1 +492,1 @@
- switch( code ) { - switch( code ) {
+ switch( static_cast<unsigned int>( code ) ) { + switch( static_cast<unsigned int>( code ) ) {
--- util/mp4art.cpp --- util/mp4art.cpp
@ -54,7 +51,7 @@ patch -N -p0 << EOF || true
+ switch( static_cast<unsigned int> ( code ) ) { + switch( static_cast<unsigned int> ( code ) ) {
--- util/mp4chaps.cpp --- util/mp4chaps.cpp
+++ util/mp4chaps.cpp +++ util/mp4chaps.cpp
@@ -635,1 +635,1 @@ @@ -678,1 +678,1 @@
- switch( code ) { - switch( code ) {
+ switch( static_cast<unsigned int> ( code ) ) { + switch( static_cast<unsigned int> ( code ) ) {
--- util/mp4file.cpp --- util/mp4file.cpp
@ -69,43 +66,29 @@ patch -N -p0 << EOF || true
+ switch( static_cast<unsigned int>( code ) ) { + switch( static_cast<unsigned int>( code ) ) {
--- util/mp4track.cpp --- util/mp4track.cpp
+++ util/mp4track.cpp +++ util/mp4track.cpp
@@ -791,1 +791,1 @@ @@ -775,1 +775,1 @@
- switch( code ) { - switch( code ) {
+ switch( static_cast<unsigned int>( code ) ) { + switch( static_cast<unsigned int>( code ) ) {
EOF EOF
## clang build errors:
## invalid suffix on literal; C++11 requires a space between literal and identifier
sed -i 's|"LIBMPV42_STRINGIFY|" LIBMPV42_STRINGIFY|' src/mp4util.h
#
## ../src/mp4.cpp:873:20: error: cannot initialize return object of type 'mp4v2_ismacrypParams *' (aka 'mp4v2_ismacryp_session_params *') with an rvalue of type 'MP4TrackId' (aka 'unsigned int')
## thanks to github.com/palmerc/mp4v2.git, commit 16eb774806e9a0c87162b9e24a633c34c90c0732
sed -i '873s|return.*$|return NULL;|' src/mp4.cpp
## Fix man pages being installed with no content
sed -i 's|doc/man|@srcdir@/&|' GNUmakefile.in
listdocs_fn listdocs_fn
chown_fn ## create mp4v2.pc.in after the installation libs and include directories have been set
sed -i '/^configure_pkg_config_file/d' CMakeLists.txt
cd_builddir_fn sed -i 's|install.*mp4v2.pc.*$|configure_pkg_config_file(mp4v2.pc.in)\n&|' CMakeLists.txt
CXXFLAGS="$SLKCFLAGS" \ ## cmake build needs to be in top level directory for created project.h file installation
CXX=$COMPILER_CXX \ cmake ${G_NINJA:-} \
../configure \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
--prefix=/usr \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
--libdir=/usr/lib$LIBDIRSUFFIX \ -DBUILD_SHARED="ON" \
--mandir=/usr/man \ -DBUILD_UTILS="ON" \
--disable-static .
make_fn make_fn
installdocs_fn installdocs_fn
INSTALL_TDE=/usr
mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -24,7 +24,7 @@
# SUCH DAMAGE. # SUCH DAMAGE.
PRGNAM=tidy-html5 PRGNAM=tidy-html5
VERSION=5.6.0 VERSION=5.8.0
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-} TAG=${TAG:-}
@ -43,7 +43,7 @@ I18N=$(echo $I18N | tr '[:upper:]' '[:lower:]')
for lang in $I18N for lang in $I18N
do do
[[ $(ls -1 src/language_*.h|grep _$lang) != "" ]] && { [[ $(ls -1 src/language_*.h|grep _$lang) != "" ]] && {
langs="${langs:-}$lang " langs="${langs:-} $lang"
sed -i "s|\"locale.h\"|&\n#include \"language_$lang.h\"|" src/language.c sed -i "s|\"locale.h\"|&\n#include \"language_$lang.h\"|" src/language.c
sed -i "s| \&language_en,|& \&language_$lang,|" src/language.c sed -i "s| \&language_en,|& \&language_$lang,|" src/language.c
} }
@ -55,6 +55,9 @@ DOCS=$(ls README.md localize/README.md README/*)
chown_fn chown_fn
## don't build static library
sed -i '396,423d' CMakeLists.txt
cd build cd build
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
@ -62,21 +65,26 @@ cmake ${G_NINJA:-} \
-DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_PREFIX=/usr/local \
-DMAN_INSTALL_DIR=/usr/man \ -DMAN_INSTALL_DIR=/usr/local/man \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DBUILD_SHARED_LIB="ON" \ -DBUILD_SHARED_LIB="ON" \
-DTIDY_CONSOLE_SHARED="ON" \ -DTIDY_CONSOLE_SHARED="ON" \
-DBUILD_TAB2SPACE="ON" \ -DBUILD_TAB2SPACE="ON" \
-DBUILD_SAMPLE_CODE="OFF" \ -DBUILD_SAMPLE_CODE="OFF" \
-DTIDY_COMPAT_HEADERS="OFF" \
-DSUPPORT_LOCALIZATIONS="OFF" \ -DSUPPORT_LOCALIZATIONS="OFF" \
-DSUPPORT_CONSOLE_APP="ON" \
-DENABLE_DEBUG_LOG="OFF" \
-DENABLE_ALLOC_DEBUG="OFF" \
-DENABLE_MEMORY_DEBUG="OFF" \
-Wno-dev \ -Wno-dev \
.. ..
make_fn make_fn
INSTALL_TDE=/usr/local
installdocs_fn installdocs_fn
INSTALL_TDE=/usr
mangzip_fn mangzip_fn
strip_fn strip_fn
@ -96,7 +104,7 @@ $PRGNAM: errors and upgrading legacy code to modern standards.
$PRGNAM: Optional with Quanta+ $PRGNAM: Optional with Quanta+
$PRGNAM: $PRGNAM:
$PRGNAM: For languages: $PRGNAM: For languages:
$PRGNAM: en ${langs:-} $PRGNAM: en${langs:-}
$PRGNAM: $PRGNAM:
$PRGNAM: https://github.com/htacg $PRGNAM: https://github.com/htacg
$PRGNAM: $PRGNAM:

@ -25,7 +25,7 @@
# #
# #
PRGNAM=xmedcon PRGNAM=xmedcon
VERSION=0.16.2 VERSION=0.22.0
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-} TAG=${TAG:-}
@ -67,7 +67,7 @@ strip_fn
mkdir_install_fn mkdir_install_fn
mv $PKG/usr/etc $PKG/ mv $PKG/usr/etc $PKG/
mv $PKG/etc/xmedconrc $PKG/etc/xmedconrc.new mv $PKG/etc/xmedcon.css $PKG/etc/xmedcon.css.new
mkdir -p $PKG/usr/share/pixmaps mkdir -p $PKG/usr/share/pixmaps
cp -a $DOCDIR/etc/xmedcon.png $PKG/usr/share/pixmaps cp -a $DOCDIR/etc/xmedcon.png $PKG/usr/share/pixmaps
@ -77,8 +77,8 @@ echo "[Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Type=Application Type=Application
Name=(X)MedCon Name=(X)MedCon
GenericName=Medical Image Conversion GenericName=Medical Image Conversion
Comment=Medical Image Conversion Comment=Medical Image Conversion
Exec=xmedcon Exec=xmedcon
Icon=xmedcon.png Icon=xmedcon.png
Categories=Graphics;Utility;" > $PKG/usr/share/applications/xmedcon.desktop Categories=Graphics;Utility;" > $PKG/usr/share/applications/xmedcon.desktop
@ -98,7 +98,7 @@ echo $'config() {
# Otherwise, we leave the .new copy for the admin to consider... # Otherwise, we leave the .new copy for the admin to consider...
} }
config etc/xmedconrc.new config etc/xmedcon.css.new
' >> $PKG/install/doinst.sh ' >> $PKG/install/doinst.sh
echo " echo "
@ -114,7 +114,7 @@ $PRGNAM:
$PRGNAM: A medical image conversion utility & library; hereby hoping to lower $PRGNAM: A medical image conversion utility & library; hereby hoping to lower
$PRGNAM: at least one barrier in medical research projects. $PRGNAM: at least one barrier in medical research projects.
$PRGNAM: $PRGNAM:
$PRGNAM: http://xmedcon.sourceforge.net/ $PRGNAM: xmedcon.sourceforge.net
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,7 +33,7 @@ URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorsta
* BUILD= - sets the package build identifier, overriding the SlackBuild default of 1 * BUILD= - sets the package build identifier, overriding the SlackBuild default of 1
* GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs * GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs
* FEAT= - for development builds - see get-source.sh * FEAT= - for development builds - see get-source.sh
* GVZ_DOCS=1 - for graphviz, include pdf and html documentation - see SlackBuild * GVZ_DOCS=y - for graphviz, include documentation - see SlackBuild
* build_regextester= - build the regex tester from the tqt3 example - see the tqt3 README * build_regextester= - build the regex tester from the tqt3 example - see the tqt3 README
--- ---

Loading…
Cancel
Save