Hello community, here is the log from the commit of package highlight for openSUSE:Factory checked in at 2016-08-24 10:08:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/highlight (Old) and /work/SRC/openSUSE:Factory/.highlight.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "highlight" Changes: -------- --- /work/SRC/openSUSE:Factory/highlight/highlight.changes 2016-08-03 11:45:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.highlight.new/highlight.changes 2016-08-24 10:08:25.000000000 +0200 @@ -1,0 +2,19 @@ +Thu Aug 11 16:14:10 UTC 2016 - antoine.belv...@laposte.net + +- Build highlight-gui with Qt5 instead of Qt4. + +------------------------------------------------------------------- +Thu Aug 11 09:08:32 UTC 2016 - antoine.belv...@laposte.net + +- Add signature verification: + * Add highlight.keyring (highlight's main developer Andre Simon + public key) + * Add highlight-3.31.tar.bz2.asc +- Update highlight-3.31.tar.bz2: + * Updated by upstream + * Windows line endings has been replaced by UNIX ones + * A useless file has been removed +- Update highlight-3.30-use_optflags.patch: + * Switch to UNIX line endings + +------------------------------------------------------------------- New: ---- highlight-3.31.tar.bz2.asc highlight.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ highlight.spec ++++++ --- /var/tmp/diff_new_pack.JYiXOi/_old 2016-08-24 10:08:26.000000000 +0200 +++ /var/tmp/diff_new_pack.JYiXOi/_new 2016-08-24 10:08:26.000000000 +0200 @@ -24,13 +24,15 @@ Group: Development/Tools/Other Url: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2 +Source1: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2.asc +Source99: highlight.keyring # PATCH-FIX-OPENSUSE highlight-2.10-makefile_suse.patch Patch0: highlight-2.10-makefile_suse.patch # PATCH-FIX-OPENSUSE highlight-3.30-use_optflags.patch Patch1: highlight-3.30-use_optflags.patch BuildRequires: boost-devel BuildRequires: gcc-c++ -BuildRequires: libqt4-devel +BuildRequires: libqt5-qtbase-devel BuildRequires: lua-devel BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,8 +64,8 @@ %patch1 %build -make QMAKE="qmake" OPTFLAGS="%{optflags}" %{?_smp_mflags} -make gui QMAKE="qmake" OPTFLAGS="%{optflags}" %{?_smp_mflags} +make OPTFLAGS="%{optflags}" %{?_smp_mflags} +make gui OPTFLAGS="%{optflags}" %{?_smp_mflags} %install %makeinstall install-gui ++++++ highlight-3.30-use_optflags.patch ++++++ --- /var/tmp/diff_new_pack.JYiXOi/_old 2016-08-24 10:08:26.000000000 +0200 +++ /var/tmp/diff_new_pack.JYiXOi/_new 2016-08-24 10:08:26.000000000 +0200 @@ -2,27 +2,27 @@ --- src/makefile.orig 2016-07-06 19:30:36.100010149 +0200 +++ src/makefile 2016-07-06 19:31:54.433504417 +0200 @@ -13,12 +13,11 @@ - # See src/gui-qt/highlight.pro for the Qt GUI compilation options - - CXX=g++ -- --# was: qmake-qt5 --QMAKE=qmake -+QMAKE=qmake-qt5 - - # Added -std=c++11 because of auto_ptr to unique_ptr transition --CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -+OPTFLAGS=-O2 -+CFLAGS:=-Wall -DNDEBUG -std=c++11 $(OPTFLAGS) - #CFLAGS:=-ggdb ${CFLAGS} - - CFLAGS_DILU=-fno-strict-aliasing + # See src/gui-qt/highlight.pro for the Qt GUI compilation options + + CXX=g++ +- +-# was: qmake-qt5 +-QMAKE=qmake ++QMAKE=qmake-qt5 + + # Added -std=c++11 because of auto_ptr to unique_ptr transition +-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 ++OPTFLAGS=-O2 ++CFLAGS:=-Wall -DNDEBUG -std=c++11 $(OPTFLAGS) + #CFLAGS:=-ggdb ${CFLAGS} + + CFLAGS_DILU=-fno-strict-aliasing @@ -113,7 +112,7 @@ gui-qt: highlight-gui - - highlight-gui: libhighlight.a ${GUI_OBJECTS} - cd gui-qt && \ -- ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ -+ ${QMAKE} QMAKE_CXXFLAGS="$(OPTFLAGS)" 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ - $(MAKE) - - $(OBJECTFILES) : makefile + + highlight-gui: libhighlight.a ${GUI_OBJECTS} + cd gui-qt && \ +- ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ ++ ${QMAKE} QMAKE_CXXFLAGS="$(OPTFLAGS)" 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ + $(MAKE) + + $(OBJECTFILES) : makefile ++++++ highlight-3.31.tar.bz2 ++++++ ++++ 6398 lines of diff (skipped)
