---- highlight-3.30/src/makefile.orig 2016-07-24 23:17:13.177486879 +0200
-+++ highlight-3.30/src/makefile 2016-07-24 23:18:05.876942844 +0200
+diff -urN highlight-3.34.orig/src/makefile highlight-3.34/src/makefile
+--- highlight-3.34.orig/src/makefile 2017-01-24 22:56:25.702768453 +0100
++++ highlight-3.34/src/makefile 2017-01-24 22:57:44.332773964 +0100
@@ -2,7 +2,7 @@
- # This file will compile the highlight library and binaries.\r
- # See INSTALL for instructions.\r
- \r
--# Add -DHL_DATA_DIR=\"/your/path/\" to CFLAGS if you want to define a\r
-+# Add -DHL_DATA_DIR=\"/your/path/\" to CXXFLAGS if you want to define a\r
- # custom installation directory not listed in INSTALL.\r
- # Copy *.conf, ./langDefs, ./themes amd ./indentSchemes to /your/path/.\r
- # See ../makefile for the definition of ${data_dir}\r
-@@ -18,10 +18,10 @@
- QMAKE=qmake\r
- \r
- # Added -std=c++11 because of auto_ptr to unique_ptr transition\r
--CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11\r
--#CFLAGS:=-ggdb ${CFLAGS}\r
-+CXXFLAGS:=-Wall -O2 ${CXXFLAGS} -DNDEBUG -std=c++11\r
-+#CXXFLAGS:=-ggdb ${CXXFLAGS}\r
- \r
--CFLAGS_DILU=-fno-strict-aliasing\r
-+CXXFLAGS_DILU=-fno-strict-aliasing\r
- \r
- SO_VERSION=3.30\r
- \r
-@@ -38,10 +38,10 @@
- # If Lua 5.2 is not default on your system yet you have to\r
- # use lua5.1 in the pkg-config calls\r
- \r
--LUA_CFLAGS=$(shell pkg-config --cflags lua)\r
-+LUA_CFLAGS=$(shell pkg-config --cflags lua5.2)\r
- \r
- # default lua lib\r
--LUA_LIBS=$(shell pkg-config --libs lua)\r
-+LUA_LIBS=$(shell pkg-config --libs lua5.2)\r
- \r
- # luajit lib\r
- # LUA_LIBS=$(shell pkg-config --libs luajit)\r
-@@ -62,7 +62,7 @@
- endif\r
- \r
- ifdef PIC\r
-- CFLAGS+=-fPIC\r
-+ CXXFLAGS+=-fPIC\r
- endif\r
- \r
- LDFLAGS = -ldl\r
-@@ -72,7 +72,7 @@
- #LDFLAGS = ${LDFLAGS} -s\r
- #LDFLAGS= -Wl,--as-needed\r
- \r
--CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}\r
-+CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}\r
- \r
- # Data directories (data dir, configuration file dir)\r
- CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"\r
-@@ -234,7 +234,7 @@
- LuaUtils.o: ${DILU_DIR}LuaUtils.cpp\r
- ${CXX_COMPILE} ${DILU_DIR}LuaUtils.cpp\r
- LuaValue.o: ${DILU_DIR}LuaValue.cpp\r
-- ${CXX_COMPILE} ${CFLAGS_DILU} ${DILU_DIR}LuaValue.cpp\r
-+ ${CXX_COMPILE} ${CXXFLAGS_DILU} ${DILU_DIR}LuaValue.cpp\r
- LuaVariable.o: ${DILU_DIR}LuaVariable.cpp\r
- ${CXX_COMPILE} ${DILU_DIR}LuaVariable.cpp\r
- LuaWrappers.o: ${DILU_DIR}LuaWrappers.cpp\r
---- highlight-3.30/src/gui-qt/highlight.pro.orig 2016-07-24 23:21:32.954798546 +0200
-+++ highlight-3.30/src/gui-qt/highlight.pro 2016-07-24 23:21:49.861289760 +0200
-@@ -35,9 +35,9 @@
- unix {\r
- DESTDIR = ../\r
- LIBS += -L.. -lhighlight\r
-- LIBS += -llua\r
-+ LIBS += -llua5.2\r
- CONFIG += link_pkgconfig\r
-- PKGCONFIG += lua\r
-+ PKGCONFIG += lua5.2\r
- \r
- # to make it run within Qt Creator\r
- !contains(DEFINES, DATA_DIR) {\r
+ # This file will compile the highlight library and binaries.
+ # See INSTALL for instructions.
+
+-# Add -DHL_DATA_DIR=\"/your/path/\" to CFLAGS if you want to define a
++# Add -DHL_DATA_DIR=\"/your/path/\" to CXXFLAGS if you want to define a
+ # custom installation directory not listed in INSTALL.
+ # Copy *.conf, ./langDefs, ./themes amd ./indentSchemes to /your/path/.
+ # See ../makefile for the definition of ${data_dir}
+@@ -19,10 +19,10 @@
+ QMAKE=qmake
+
+ # Added -std=c++11 because of auto_ptr to unique_ptr transition
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
+-#CFLAGS:=-ggdb ${CFLAGS}
++CXXFLAGS:=-Wall -O2 ${CXXFLAGS} -DNDEBUG -std=c++11
++#CXXFLAGS:=-ggdb ${CXXFLAGS}
+
+-CFLAGS_DILU=-fno-strict-aliasing
++CXXFLAGS_DILU=-fno-strict-aliasing
+
+ SO_VERSION=3.30
+
+@@ -39,10 +39,10 @@
+ # If Lua 5.2 is not default on your system yet you have to
+ # use lua5.1 in the pkg-config calls
+
+-LUA_CFLAGS=$(shell pkg-config --cflags lua)
++LUA_CFLAGS=$(shell pkg-config --cflags lua5.2)
+
+ # default lua lib
+-LUA_LIBS=$(shell pkg-config --libs lua)
++LUA_LIBS=$(shell pkg-config --libs lua5.2)
+
+ # luajit lib
+ # LUA_LIBS=$(shell pkg-config --libs luajit)
+@@ -63,7 +63,7 @@
+ endif
+
+ ifdef PIC
+- CFLAGS+=-fPIC
++ CXXFLAGS+=-fPIC
+ endif
+
+ LDFLAGS = -ldl
+@@ -73,7 +73,7 @@
+ #LDFLAGS = ${LDFLAGS} -s
+ #LDFLAGS= -Wl,--as-needed
+
+-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
++CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
+
+ # Data directories (data dir, configuration file dir)
+ CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
+@@ -235,7 +235,7 @@
+ LuaUtils.o: ${DILU_DIR}LuaUtils.cpp
+ ${CXX_COMPILE} ${DILU_DIR}LuaUtils.cpp
+ LuaValue.o: ${DILU_DIR}LuaValue.cpp
+- ${CXX_COMPILE} ${CFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
++ ${CXX_COMPILE} ${CXXFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
+ LuaVariable.o: ${DILU_DIR}LuaVariable.cpp
+ ${CXX_COMPILE} ${DILU_DIR}LuaVariable.cpp
+ LuaWrappers.o: ${DILU_DIR}LuaWrappers.cpp
+diff -urN highlight-3.34.orig/src/gui-qt/highlight.pro highlight-3.34/src/gui-qt/highlight.pro
+--- highlight-3.34.orig/src/gui-qt/highlight.pro 2017-01-24 22:56:25.702768453 +0100
++++ highlight-3.34/src/gui-qt/highlight.pro 2017-01-24 22:58:08.419208074 +0100
+@@ -38,9 +38,9 @@
+ unix {
+ DESTDIR = ../
+ LIBS += -L.. -lhighlight
+- LIBS += -llua
++ LIBS += -llua5.2
+ CONFIG += link_pkgconfig
+- PKGCONFIG += lua
++ PKGCONFIG += lua5.2
+
+ # to make it run within Qt Creator
+ !contains(DEFINES, DATA_DIR) {
projects / packages / highlight.git / commitdiff