diff --git a/mingw-w64-graphicsmagick/001-relocate.patch b/mingw-w64-graphicsmagick/001-relocate.patch index 6a6a66025c..9786f33c3b 100644 --- a/mingw-w64-graphicsmagick/001-relocate.patch +++ b/mingw-w64-graphicsmagick/001-relocate.patch @@ -23,13 +23,13 @@ diff -Naur GraphicsMagick-1.3.20-orig/magick/blob.c GraphicsMagick-1.3.20/magick # if defined(MagickShareConfigPath) - AddConfigurePath(path_map,&path_index,MagickShareConfigPath,exception); -+ char * path_share = single_path_relocation(MagickBinPath, MagickShareConfigPath); ++ char * path_share = single_path_relocation_lib(MagickBinPath, MagickShareConfigPath); + AddConfigurePath(path_map,&path_index,path_share,exception); # endif /* defined(MagickShareConfigPath) */ # if defined(MagickLibConfigPath) - AddConfigurePath(path_map,&path_index,MagickLibConfigPath,exception); -+ char * path_lib = single_path_relocation(MagickBinPath, MagickLibConfigPath); ++ char * path_lib = single_path_relocation_lib(MagickBinPath, MagickLibConfigPath); + AddConfigurePath(path_map,&path_index,path_lib,exception); # endif /* defined(MagickLibConfigPath) */ @@ -48,12 +48,12 @@ diff -Naur GraphicsMagick-1.3.20-orig/magick/blob.c GraphicsMagick-1.3.20/magick FormatString(path,"%.1024s/lib/%s/",prefix,MagickLibConfigSubDir); - AddConfigurePath(path_map,&path_index,path,exception); -+ char * path_sub_lib = single_path_relocation(MagickBinPath, path); ++ char * path_sub_lib = single_path_relocation_lib(MagickBinPath, path); + AddConfigurePath(path_map,&path_index,path_sub_lib,exception); FormatString(path,"%.1024s/share/%s/",prefix,MagickShareConfigSubDir); - AddConfigurePath(path_map,&path_index,path,exception); -+ char * path_sub_share = single_path_relocation(MagickBinPath, path); ++ char * path_sub_share = single_path_relocation_lib(MagickBinPath, path); + AddConfigurePath(path_map,&path_index,path_sub_share,exception); #else /* defined(POSIX) */ FormatString(path,"%.1024s%s",SetClientPath((char *) NULL), @@ -116,11 +116,11 @@ diff -Naur GraphicsMagick-1.3.20-orig/magick/module.c GraphicsMagick-1.3.20/magi case MagickCoderModule: default: - module_directory=MagickCoderModulesPath; -+ module_directory = single_path_relocation(MagickBinPath, MagickCoderModulesPath); ++ module_directory = single_path_relocation_lib(MagickBinPath, MagickCoderModulesPath); break; case MagickFilterModule: - module_directory=MagickFilterModulesPath; -+ module_directory = single_path_relocation(MagickBinPath, MagickFilterModulesPath); ++ module_directory = single_path_relocation_lib(MagickBinPath, MagickFilterModulesPath); break; } @@ -137,7 +137,7 @@ diff -Naur GraphicsMagick-1.3.20-orig/magick/module.c GraphicsMagick-1.3.20/magi } FormatString(path,"%.512s/lib/%s/",getenv("MAGICK_HOME"),subdir); -+ char * path_home_dirs = single_path_relocation(MagickBinPath, path); ++ char * path_home_dirs = single_path_relocation_lib(MagickBinPath, path); + AddModulePath(path_map,&path_index,path_home_dirs,exception); # else FormatString(path,"%.512s%s",getenv("MAGICK_HOME"), @@ -160,7 +160,7 @@ diff -Naur GraphicsMagick-1.3.20-orig/magick/module.c GraphicsMagick-1.3.20/magi ChopPathComponents(prefix,1); FormatString(path,"%.512s/lib/%s/modules-Q%d/%s/",prefix, MagickLibSubdir,QuantumDepth,module_subdir); -+ char * path_home_modules = single_path_relocation(MagickBinPath, path); ++ char * path_home_modules = single_path_relocation_lib(MagickBinPath, path); + AddModulePath(path_map,&path_index,path_home_modules,exception); # else /* end defined(POSIX) */ FormatString(path,"%.512s%s",SetClientPath((char *) NULL), diff --git a/mingw-w64-graphicsmagick/PKGBUILD b/mingw-w64-graphicsmagick/PKGBUILD index bab095fc3a..3fa5861ad6 100644 --- a/mingw-w64-graphicsmagick/PKGBUILD +++ b/mingw-w64-graphicsmagick/PKGBUILD @@ -4,7 +4,7 @@ _realname=graphicsmagick pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.37 -pkgrel=3 +pkgrel=4 pkgdesc="An image viewing/manipulation program (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -44,7 +44,7 @@ source=(https://sourceforge.net/projects/graphicsmagick/files/${_realname}/${pkg sha256sums=('90dc22f1a7bd240e4c9065a940962bf13da43c99bcc36cb111cc3c1a0d7477d4' '703cd0cb74e714f9e66d26de11c109dd76fab07e723af8dde56a35ea65102e5f' '4f9d325265ef6f4e90ad637dea41afa6995388c921fe961ad5dc895aca10318b' - '3839c6b0322448307fbe1eb469bb0f3264b6014ebe94e07600254ae72b68b166') + '5afcb45e317a04a490f55d4e3d1fe079a46527dd1ace008569481f49c2a6eb41') # Helper macros to help make tasks easier # apply_patch_with_msg() {