Commit c80e5a17 authored by Andreas Rönnquist's avatar Andreas Rönnquist

Update upstream source from tag 'upstream/1.12'

Update to upstream version '1.12'
with Debian dir f419c6e1936aa0aa9fe2368a7767a7465401727c
parents c4da5b43 4f1f7133
......@@ -2,6 +2,12 @@
ChangeLog:
----------
1.12
* Remove GTK2 compatibility header file
* Minor fixes
* Make pkg-config substitutable
* Make it easier to build on Windows
1.11
* Remove checks for GTK version, we require GTK 3 from now on
* Update required LUA version to 5.3
......
......@@ -7,6 +7,9 @@
ifndef CC
CC=gcc
endif
ifndef PKG_CONFIG
PKG_CONFIG=pkg-config
endif
SRC=src
BIN=bin
GRPH=graphics
......@@ -49,9 +52,9 @@ VERSION=$(shell cat ./VERSION)
PKG_GTK=gtk+-3.0
CHECK_GTK3=1
LIB_CFLAGS=$(shell pkg-config --cflags --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.3 || pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua)
LIB_CFLAGS=$(shell $(PKG_CONFIG) --cflags --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.3 || $(PKG_CONFIG) --cflags $(PKG_GTK) $(PKG_WNCK) lua)
STD_LDFLAGS=
LIBS=-lX11 $(shell pkg-config --libs --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.3 || pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua)
LIBS=-lX11 $(shell $(PKG_CONFIG) --libs --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.3 || $(PKG_CONFIG) --libs $(PKG_GTK) $(PKG_WNCK) lua)
LOCAL_CFLAGS=$(STD_CFLAGS) $(DEPRECATED) $(CFLAGS) $(LIB_CFLAGS)
LOCAL_LDFLAGS=$(STD_CFLAGS) $(LDFLAGS) $(STD_LDFLAGS)
......@@ -91,6 +94,6 @@ uninstall:
${MAKE} -C po uninstall
$(DEPEND):
$(CC) $(LOCAL_CFLAGS) -MM $(SRC)/*.c | sed -e "s/\([A-Za-z0-9+-0._&+-]*:\)/\$(OBJ)\/\1/g" > $(DEPEND)
$(CC) $(LOCAL_CFLAGS) -MM $(SRC)/*.c | sed -e "s/\([A-Za-z0-9+-0._&+-]*:\)/\$(OBJ)\/\1/g" -e "s/obj\/C\:/\/C/g" > $(DEPEND)
-include $(DEPEND)
1.11
\ No newline at end of file
1.12
\ No newline at end of file
/**
* gtk3_compat.h - GTK3 compatibility definitions
*
* Copyright 2011-2017 Andreas Rönnquist
*
* This file is part of SciteProj.
*
* SciteProj is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* SciteProj is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with SciteProj. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef __HEADER_GTK3_COMPAT_
#define __HEADER_GTK3_COMPAT_
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
/*
#ifndef GDK_KEY_Return
#define GDK_KEY_BackSpace GDK_BackSpace
#define GDK_KEY_Delete GDK_Delete
#define GDK_KEY_Insert GDK_Insert
#define GDK_KEY_Return GDK_Return
#define GDK_KEY_KP_Enter GDK_KP_Enter
#define GDK_KEY_Escape GDK_Escape
#define GDK_KEY_F2 GDK_F2
#define GDK_KEY_F5 GDK_F5
#endif
*/
#endif /*__HEADER_GTK3_COMPAT_*/
......@@ -56,10 +56,6 @@
#include "menus.h"
#include "gtk3_compat.h"
// Forward-declare static functions
......
......@@ -56,8 +56,6 @@
#include "load_folder.h"
#include "gtk3_compat.h"
#include "script.h"
......
......@@ -59,7 +59,7 @@ void group_properties_gui(GtkTreeModel *tree_model, GtkTreeIter *iter)
GtkWidget *table;
GtkWidget *label1, *label2;
GtkWidget *filename, *filepath_label;
GtkWidget *container_box = NULL;
GtkWidget *container_box;
gchar *filePath = NULL;
int nodeType = -1;
......
......@@ -852,7 +852,7 @@ void init_scite_connection()
/**
*
*/
gboolean open_filename(gchar *filename,gchar *project_directory,GError **err)
gboolean open_filename(gchar *filename, gchar *project_directory, GError **err)
{
gchar *command = NULL;
......
/**
* scite_utils_linux.h - Code for working with Scite (GNU/Linux version)
*
* Copyright 2006 Roy Wood, 2009-2017 Andreas Rönnquist
* Copyright 2006 Roy Wood, 2009-2018 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment