From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- .../root/files/root-5.28.00b-glibc212.patch | 11 -- sci-physics/root/files/root-5.32.00-cfitsio.patch | 13 -- sci-physics/root/files/root-5.32.00-chklib64.patch | 24 ---- sci-physics/root/files/root-5.32.00-dotfont.patch | 58 --------- .../root/files/root-5.34.05-nobyte-compile.patch | 137 --------------------- sci-physics/root/files/root-5.34.13-unuran.patch | 40 ------ sci-physics/root/files/root-5.34.26-ldflags.patch | 19 --- sci-physics/root/files/root-6.13.02-hsimple.patch | 31 +++++ sci-physics/root/files/root-6.14.00-http.patch | 28 +++++ 9 files changed, 59 insertions(+), 302 deletions(-) delete mode 100644 sci-physics/root/files/root-5.28.00b-glibc212.patch delete mode 100644 sci-physics/root/files/root-5.32.00-cfitsio.patch delete mode 100644 sci-physics/root/files/root-5.32.00-chklib64.patch delete mode 100644 sci-physics/root/files/root-5.32.00-dotfont.patch delete mode 100644 sci-physics/root/files/root-5.34.05-nobyte-compile.patch delete mode 100644 sci-physics/root/files/root-5.34.13-unuran.patch delete mode 100644 sci-physics/root/files/root-5.34.26-ldflags.patch create mode 100644 sci-physics/root/files/root-6.13.02-hsimple.patch create mode 100644 sci-physics/root/files/root-6.14.00-http.patch (limited to 'sci-physics/root/files') diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch b/sci-physics/root/files/root-5.28.00b-glibc212.patch deleted file mode 100644 index a365431396f5..000000000000 --- a/sci-physics/root/files/root-5.28.00b-glibc212.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- root.orig/net/auth/src/TAFS.cxx 2010-09-14 03:22:22.647915854 +0400 -+++ root/net/auth/src/TAFS.cxx 2010-09-14 03:22:39.034599899 +0400 -@@ -11,6 +11,7 @@ - - #ifndef WIN32 - # include -+# include - #else - # define ssize_t int - # include - diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch deleted file mode 100644 index 156667f8fee4..000000000000 --- a/sci-physics/root/files/root-5.32.00-cfitsio.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure 2012-01-19 23:44:44.127607638 +0100 -+++ b/configure 2012-01-20 00:19:20.420652913 +0100 -@@ -3435,9 +3435,7 @@ - cfitsioinc=$found_hdr - cfitsioincdir=$found_dir - -- # At this time, libcfitsio.a should always be prefered over .so, -- # to avoid forcing users to install cfitsio. -- check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \ -+ check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \ - $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \ - ${finkdir:+$finkdir/lib} \ - /usr/local/lib /usr/lib /opt/cfitsio/lib diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch deleted file mode 100644 index 23f20d54f0cc..000000000000 --- a/sci-physics/root/files/root-5.32.00-chklib64.patch +++ /dev/null @@ -1,24 +0,0 @@ -bug fix for #406817 ---- a/configure 2012-02-29 19:46:41.000000000 +0400 -+++ b/configure 2012-03-22 03:28:43.458968696 +0400 -@@ -441,14 +441,13 @@ - fi - else - if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then -- check_link $chklib64 -- ret=$link_result -- else -- logmsg " file $filearg $chklib64 | grep '64-bit'" -- if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then -- ret=1 -- fi -+ # get real binary .so name from .so ld script -+ chklib64=$(gawk '($1 == "GROUP") { print $3 }' $chklib64) - fi -+ logmsg " file $filearg $chklib64 | grep '64-bit'" -+ if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then -+ ret=1 -+ fi - fi - logmsg " result: $ret" - if test $ret -eq 1 ; then diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch deleted file mode 100644 index 85d6dea7655e..000000000000 --- a/sci-physics/root/files/root-5.32.00-dotfont.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.000000000 +0400 -+++ root/html/src/TClassDocOutput.cxx 2012-05-29 21:36:53.813593012 +0400 -@@ -625,7 +625,7 @@ - << "size=\"8,10\";" << endl - << "ratio=auto;" << endl - << "margin=0;" << endl -- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl -+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl - << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl; - - std::stringstream ssDep; -@@ -704,7 +704,7 @@ - outdot << ";" << endl; - } else if (writeAndMoreFor) { - outdot << " \"...andmore" << writeAndMoreFor->GetName() -- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl; -+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl; - } - } - if (!levelExists) break; -@@ -733,7 +733,7 @@ - << "ranksep=0.1;" << endl - << "nodesep=0;" << endl - << "margin=0;" << endl; -- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl; -+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl; - - std::stringstream ssDep; - const int numColumns = 3; -@@ -939,7 +939,7 @@ - << "ranksep=0;" << endl - << "nodesep=0;" << endl - << "size=\"8,10\";" << endl -- << "node [fontsize=20,shape=plaintext];" << endl; -+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl; - - for (std::list::iterator iFile = listFilesToParse.begin(); - iFile != listFilesToParse.end(); ++iFile) { -@@ -999,7 +999,8 @@ - << "ranksep=0.7;" << endl - << "nodesep=0.3;" << endl - << "size=\"8,8\";" << endl -- << "ratio=compress;" << endl; -+ << "ratio=compress;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - TString libs(fCurrentClass->GetSharedLibs()); - outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl; -@@ -1109,7 +1110,8 @@ - - dotout << "digraph G {" << endl - << "ratio=auto;" << endl -- << "rankdir=RL;" << endl; -+ << "rankdir=RL;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - // loop on all classes - TClassDocInfo* cdi = 0; diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch deleted file mode 100644 index ec67a15887f6..000000000000 --- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur root.as-needed/Makefile root/Makefile ---- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400 -+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400 -@@ -1258,10 +1258,7 @@ - for lib in $(RFLX_GRFLXPY); do \ - rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ - done; \ -- for lib in $(RFLX_GRFLXPYC); do \ -- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ -- done; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(subst lib/,,$(RFLX_GRFLXDD)); \ - while test "x$${dir}" != "x" && \ - test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ -diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk ---- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 -+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 -@@ -48,8 +48,6 @@ - ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) - $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ - endif --ROOTPYC := $(ROOTPY:.py=.pyc) --ROOTPYO := $(ROOTPY:.py=.pyo) - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) -@@ -68,10 +66,8 @@ - include/%.h: $(PYROOTDIRI)/%.h - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - --$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ -+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ - $(ROOTLIBSDEP) $(PYTHONLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ -@@ -113,7 +109,7 @@ - - distclean-$(MODNAME): clean-$(MODNAME) - @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ -- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ -+ $(ROOTPY) $(PYROOTMAP) \ - $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) - - distclean:: distclean-$(MODNAME) -diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules ---- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 -+++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 -@@ -691,10 +691,6 @@ - -X$(SYSCONFDIR)/root/system.rootauthrc \ - -X$(SYSCONFDIR)/root/system.rootdaemonrc \ - -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ - -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ - -X$(PREFIX)/include/root/Minuit2 - # $(foreach i, \ -diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk ---- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 -+++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -31,10 +31,6 @@ - CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) - $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ - endif --ifneq ($(BUILDPYTHON),no) --CINTEXPYC := $(CINTEXPY:.py=.pyc) --CINTEXPYO := $(CINTEXPY:.py=.pyo) --endif - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) -@@ -86,8 +82,6 @@ - fi) - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - - $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ - $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) -diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk ---- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -48,9 +48,6 @@ - RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) - RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) - RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) --ifneq ($(BUILDPYTHON),no) --RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) --endif - - RFLX_LIBDIR = $(LIBDIR) - -@@ -92,7 +89,7 @@ - - ALLEXECS += $(RFLX_GENMAPX) - --POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+POSTBIN += $(RFLX_GRFLXPY) - - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ -@@ -122,8 +119,6 @@ - mkdir -p lib/python/genreflex; fi ) - cp $< $@ - --$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py -- @python -c 'import py_compile; py_compile.compile( "$<" )' - - $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap - -@@ -149,7 +144,7 @@ - $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ - -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) - --all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) - - clean-genreflex: - @rm -rf lib/python/genreflex -diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt ---- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 -@@ -15,7 +15,7 @@ - ##################### sources #################### - - FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) --SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) -+SET(GENREFLEX_SCRIPT PARENT_SCOPE) - - ##################### gccxmlpath #################### - diff --git a/sci-physics/root/files/root-5.34.13-unuran.patch b/sci-physics/root/files/root-5.34.13-unuran.patch deleted file mode 100644 index 8262313184b5..000000000000 --- a/sci-physics/root/files/root-5.34.13-unuran.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk -index 00a530b..7cd22dc 100644 ---- a/math/unuran/Module.mk -+++ b/math/unuran/Module.mk -@@ -31,7 +31,7 @@ UNRS := $(wildcard $(UNRDIRS)/src/utils/*.c) \ - $(wildcard $(UNRDIRS)/src/uniform/*.c) \ - $(wildcard $(UNRDIRS)/src/urng/*.c) - else --UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -)) -+UNRTARCONTENT:= - UNRS := $(filter %.c, \ - $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \ - $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \ -@@ -81,10 +81,9 @@ INCLUDEFILES += $(UNURANDEP) - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) - --include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG) -+include/%.h: $(UNURANDIRI)/%.h - cp $< $@ - --$(UNURANDEP): $(UNRCFG) - $(UNRS): $(UNURANETAG) - - $(UNURANETAG): $(UNRSRCS) -@@ -137,12 +136,12 @@ $(UNRCFG): $(UNURANETAG) - GNUMAKE=$(MAKE) ./configure CC="$$ACC" \ - CFLAGS="$$ACFLAGS"); - --$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \ -+$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \ - $(MAINLIBS) $(UNURANLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libUnuran.$(SOEXT) $@ \ - "$(UNURANO) $(UNURANDO)" \ -- "$(UNURANLIBEXTRA) $(UNRO)" -+ "$(UNURANLIBEXTRA) -lunuran" - - $(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP) - $(MAKEDIR) diff --git a/sci-physics/root/files/root-5.34.26-ldflags.patch b/sci-physics/root/files/root-5.34.26-ldflags.patch deleted file mode 100644 index b81dbb5edb00..000000000000 --- a/sci-physics/root/files/root-5.34.26-ldflags.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b -Author: Andrew Savchenko -Date: Sun Feb 22 03:45:21 2015 +0300 - - root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch - -diff --git a/config/Makefile.in b/config/Makefile.in -index 89674e7..91d25b9 100644 ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -29,7 +29,7 @@ EXTRA_CFLAGS := -Iinclude @cflags@ - USERCONF_CFLAGS:= @usercflags@ - EXTRA_CXXFLAGS := -Iinclude @cflags@ - USERCONF_CXXFLAGS:= @usercxxflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WERROR := @werror@ - WINRTDEBUG := @winrtdebug@ - diff --git a/sci-physics/root/files/root-6.13.02-hsimple.patch b/sci-physics/root/files/root-6.13.02-hsimple.patch new file mode 100644 index 000000000000..cab8a40afa7a --- /dev/null +++ b/sci-physics/root/files/root-6.13.02-hsimple.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03af62fcd3..8ec5330773 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -367,26 +367,6 @@ else() + install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}) + endif() + +-#---hsimple.root---------(use the executable for clearer dependencies and proper return code)--- +-add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root) +-add_dependencies(hsimple onepcm) +-if(WIN32) +- add_custom_command(OUTPUT tutorials/hsimple.root +- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && +- set ROOTIGNOREPREFIX=1 && +- $ -l -q -b -n -x hsimple.C -e return +- WORKING_DIRECTORY tutorials +- DEPENDS $ Cling Hist Tree Gpad Graf HistPainter move_artifacts) +-else() +- add_custom_command(OUTPUT tutorials/hsimple.root +- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} +- ROOTIGNOREPREFIX=1 +- $ -l -q -b -n -x hsimple.C -e return +- WORKING_DIRECTORY tutorials +- DEPENDS $ Cling Hist Tree Gpad Graf HistPainter move_artifacts) +-endif() +-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests) +- + #---version-------------------------------------------------------------------------------------- + if(NOT WIN32) + add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR} diff --git a/sci-physics/root/files/root-6.14.00-http.patch b/sci-physics/root/files/root-6.14.00-http.patch new file mode 100644 index 000000000000..04ec4bea567b --- /dev/null +++ b/sci-physics/root/files/root-6.14.00-http.patch @@ -0,0 +1,28 @@ +From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001 +From: Guilherme Amadio +Date: Wed, 27 Jun 2018 15:08:07 +0200 +Subject: [PATCH] Do not exclude etc/http directory from installation + +This was an unintended side-effect of a previous commit: +9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1. +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c760d0fdb..a3a0f59925 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX) + PATTERN "rootd.xinetd" EXCLUDE + PATTERN "proofd.xinetd" EXCLUDE + PATTERN "root.mimes" EXCLUDE +- PATTERN "cmake" EXCLUDE +- PATTERN "http" EXCLUDE ) ++ PATTERN "cmake" EXCLUDE ) + install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR}) + install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR}) + install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR}) +-- +2.18.0 + -- cgit v1.2.3