Compare commits

...

9 Commits

Author SHA1 Message Date
065daeaa7c Update README.md for MSYS2 transition 2017-02-20 16:28:12 +00:00
62bc95e7ba Finalize transition to MSYS2
Everything appears to work fine...

Closes #5
Closes #6
2017-02-20 16:02:31 +00:00
0d5724262f gtk+3 3.22.7 2017-01-19 05:05:12 +00:00
e4c1944e2d gtk+3 3.22.6 2017-01-18 11:03:22 +00:00
cc82f4c746 fix gtk2 installer 2016-11-29 17:33:29 +00:00
939e50d7c7 Adding missing 2 files 2016-09-18 21:13:03 +02:00
5f5fbc5a12 Fixing wrong directoy copy script 2016-09-07 07:22:41 +02:00
fb293f2b79 More changes to have a complete MSYS2 version
Extended the copy script, did a deep dependency research and modified installed libraries
2016-09-06 23:03:14 +02:00
eb4d5b4717 Modified the binary files to use MSYS2 environment of GTK (mingw64 folder)
Also added a script which copies all necessary files from the appropriate MSYS2/mingw64 folders to the bin folder of the install environment
Updated GTK3 NSI script
2016-09-05 21:21:51 +02:00
2949 changed files with 716 additions and 1369 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
gtk2-runtime*-ts-win64*exe
gtk3-runtime*-ts-win64*exe
*.swp
/.vscode

View File

@ -9,51 +9,46 @@ The installers can be found [here](http://lvserver.ugent.be/gtk-win64/).
**[Keep in mind though that these packages are experimental. Binary compatibility between versions is not guaranteed!!!.](http://www.gtk.org/download/win64.php)**
Both for convencience as well as for increased reliability across installations, it is recommended for developers to compile and link against the GTK+ SDK that I used to create the installers. This SDK can also be obtained at the aforementioned url.
The current releases ([gtk2-runtime-2.24.31-2017-02-20-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk2-runtime/gtk2-runtime-2.24.31-2017-02-20-ts-win64.exe) and [gtk3-runtime-3.22.8-2017-02-20-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk3-runtime/gtk3-runtime-3.22.8-2017-02-20-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](www.msys2.org), and were **not** compiled by myself, as was the case for previous releases. Users who want to compile against this runtime are strongly encouraged to set up a MSYS2 installation themselves, and install the required packages (compiled with the mingw-w64-x86\_64 toolchain!!!).
The current releases ([gtk2-runtime-2.24.30-2016-04-09-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk2-runtime/gtk2-runtime-2.24.30-2016-04-09-ts-win64.exe) and [gtk3-runtime-3.20.2-2016-04-09-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk3-runtime/gtk3-runtime-3.20.2-2016-04-09-ts-win64.exe)) have been compiled using GCC 5.1.0 (MinGW-w64 installed from TDM-GCC).
The included GTK+ dependencies were selected according to the flowchart used by [Hexchat](http://hexchat.github.io/gtk-win32/). The source tarballs can be obtained by clicking on the names of the dependencies in the following list:
The following packages are included in the current GTK+-2/3 installers
* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.20)
* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.20.0)
* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.22.0)
* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.22.0)
* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.24.2)
* [cairo](http://cairographics.org/releases/) (1.14.6)
* [cairo](http://cairographics.org/releases/) (1.15.4)
* [cairomm](http://cairographics.org/releases/) (1.12.0)
* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.11.1)
* [freetype](http://www.freetype.org/download.html) (2.6.3)
* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.34.0)
* [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.7)
* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.48.0)
* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.48.1)
* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.30)
* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.20.2)
* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.12.1)
* [freetype](http://www.freetype.org/download.html) (2.7.1)
* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.5)
* [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.8)
* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.50.3)
* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.50.0)
* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.31)
* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.22.8)
* [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.4)
* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.20.0)
* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.22.0)
* [gtksourceview2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (2.10.5)
* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.20.1)
* [gtksourceviewmm2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (2.10.3)
* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.20.4)
* ~~[gtksourceviewmm2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (2.10.3)~~ (currently unavailable)
* [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.18.0)
* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.1.4)
* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.3.4)
* [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
* [icon-naming-utils](http://tango.freedesktop.org/releases/) (0.8.90)
* [intltool](http://ftp.gnome.org/pub/gnome/sources/intltool/) (0.51.0)
* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.2.0)
* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.2.2)
* [libepoxy](https://github.com/anholt/libepoxy) (1.3.1)
* [libffi](http://sourceware.org/libffi/) (3.2.1)
* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.21)
* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.8.0)
* [libxml2](http://xmlsoft.org/sources/) (2.9.3)
* [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.1)
* [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.14)
* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.28)
* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.0)
* [libxml2](http://xmlsoft.org/sources/) (2.9.4)
* [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.0)
* [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.0.0)
* [libxslt](http://xmlsoft.org/sources/) (1.1.28)
* [mm-common](http://ftp.gnome.org/pub/GNOME/sources/mm-common/) (0.9.9)
* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.40.0)
* [libxslt](http://xmlsoft.org/sources/) (1.1.29)
* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.40.3)
* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.40.0)
* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.38)
* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.40)
* [pixman](http://cairographics.org/releases/) (0.34.0)
* [pkg-config](http://pkgconfig.freedesktop.org/releases/) (0.29.1)
* [win-iconv](https://github.com/win-iconv/win-iconv) (0.0.8)
* [zlib](http://www.zlib.net) (1.2.8)
* [zlib](http://www.zlib.net) (1.2.11)
For all other information regarding how to use the installer, the reader is kindly referred to [Alexander Shaduri's website](http://gtk-win.sourceforge.net) of the GTK for Windows runtime environment installer. The only difference with the installers found at his website is that mine DO NOT have the `compatdlls` option, but this should present no problems to any user.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,799 +0,0 @@
#!/usr/bin/env python
#
# Copyright (C) 2006-2008 Async Open Source
# Henrique Romano <henrique@async.com.br>
# Johan Dahlin <jdahlin@async.com.br>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program 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 Lesser General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# TODO:
# Toolbars
"""Usage: gtk-builder-convert [OPTION] [INPUT] [OUTPUT]
Converts Glade files into XML files which can be loaded with GtkBuilder.
The [INPUT] file is
-w, --skip-windows Convert everything but GtkWindow subclasses.
-r, --root Convert only widget named root and its children
-h, --help display this help and exit
When OUTPUT is -, write to standard output.
Examples:
gtk-builder-convert preference.glade preferences.ui
Report bugs to http://bugzilla.gnome.org/."""
import getopt
import os
import sys
from xml.dom import minidom, Node
DIALOGS = ['GtkDialog',
'GtkFileChooserDialog',
'GtkMessageDialog']
WINDOWS = ['GtkWindow'] + DIALOGS
# The subprocess is only available in Python 2.4+
try:
import subprocess
subprocess # pyflakes
except ImportError:
subprocess = None
def get_child_nodes(node):
assert node.tagName == 'object'
nodes = []
for child in node.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
if child.tagName != 'child':
continue
nodes.append(child)
return nodes
def get_properties(node):
assert node.tagName == 'object'
properties = {}
for child in node.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
if child.tagName != 'property':
continue
value = child.childNodes[0].data
properties[child.getAttribute('name')] = value
return properties
def get_property(node, property_name):
assert node.tagName == 'object'
properties = get_properties(node)
return properties.get(property_name)
def get_property_node(node, property_name):
assert node.tagName == 'object'
properties = {}
for child in node.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
if child.tagName != 'property':
continue
if child.getAttribute('name') == property_name:
return child
def get_signal_nodes(node):
assert node.tagName == 'object'
signals = []
for child in node.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
if child.tagName == 'signal':
signals.append(child)
return signals
def get_property_nodes(node):
assert node.tagName == 'object'
properties = []
for child in node.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
# FIXME: handle comments
if child.tagName == 'property':
properties.append(child)
return properties
def get_accelerator_nodes(node):
assert node.tagName == 'object'
accelerators = []
for child in node.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
if child.tagName == 'accelerator':
accelerators.append(child)
return accelerators
def get_object_node(child_node):
assert child_node.tagName == 'child', child_node
nodes = []
for node in child_node.childNodes:
if node.nodeType != Node.ELEMENT_NODE:
continue
if node.tagName == 'object':
nodes.append(node)
assert len(nodes) == 1, nodes
return nodes[0]
def copy_properties(node, props, prop_dict):
assert node.tagName == 'object'
for prop_name in props:
child = get_property_node(node, prop_name)
if child is not None:
prop_dict[prop_name] = child
return node
class GtkBuilderConverter(object):
def __init__(self, skip_windows, target_version, root):
self.skip_windows = skip_windows
self.target_version = target_version
self.root = root
self.root_objects = []
self.objects = {}
#
# Public API
#
def parse_file(self, file):
self._dom = minidom.parse(file)
self._parse()
def parse_buffer(self, buffer):
self._dom = minidom.parseString(buffer)
self._parse()
def to_xml(self):
xml = self._dom.toprettyxml("", "")
return xml.encode('utf-8')
#
# Private
#
def _get_object(self, name):
return self.objects.get(name)
def _get_objects_by_attr(self, attribute, value):
return [w for w in self._dom.getElementsByTagName("object")
if w.getAttribute(attribute) == value]
def _create_object(self, obj_class, obj_id, template=None, properties=None):
"""
Creates a new <object> tag.
Optionally a name template can be provided which will be used
to avoid naming collisions.
The properties dictionary can either contain string values or Node
values. If a node is provided the name of the node will be overridden
by the dictionary key.
@param obj_class: class of the object (class tag)
@param obj_id: identifier of the object (id tag)
@param template: name template to use, for example 'button'
@param properties: dictionary of properties
@type properties: string or Node.
@returns: Newly created node of the object
"""
if template is not None:
count = 1
while True:
obj_id = template + str(count)
widget = self._get_object(obj_id)
if widget is None:
break
count += 1
obj = self._dom.createElement('object')
obj.setAttribute('class', obj_class)
obj.setAttribute('id', obj_id)
if properties:
for name, value in properties.items():
if isinstance(value, Node):
# Reuse the node, so translatable and context still will be
# set when converting nodes. See also #509153
prop = value
else:
prop = self._dom.createElement('property')
prop.appendChild(self._dom.createTextNode(value))
prop.setAttribute('name', str(name))
obj.appendChild(prop)
self.objects[obj_id] = obj
return obj
def _create_root_object(self, obj_class, template, properties=None):
obj = self._create_object(obj_class, None, template, properties)
self.root_objects.append(obj)
return obj
def _parse(self):
glade_iface = self._dom.getElementsByTagName("glade-interface")
assert glade_iface, ("Badly formed XML, there is "
"no <glade-interface> tag.")
# Rename glade-interface to interface
glade_iface[0].tagName = 'interface'
self._interface = glade_iface[0]
# Remove glade-interface doc type
for node in self._dom.childNodes:
if node.nodeType == Node.DOCUMENT_TYPE_NODE:
if node.name == 'glade-interface':
self._dom.removeChild(node)
# Strip unsupported tags
for tag in ['requires', 'requires-version']:
for child in self._dom.getElementsByTagName(tag):
child.parentNode.removeChild(child)
if self.root:
self._strip_root(self.root)
# Rename widget to object
objects = self._dom.getElementsByTagName("widget")
for node in objects:
node.tagName = "object"
for node in objects:
self._convert(node.getAttribute("class"), node)
if self._get_object(node.getAttribute('id')) is not None:
print "WARNING: duplicate id \"" + node.getAttribute('id') + "\""
self.objects[node.getAttribute('id')] = node
# Convert Gazpachos UI tag
for node in self._dom.getElementsByTagName("ui"):
self._convert_ui(node)
# Convert accessibility tag
for node in self._dom.getElementsByTagName("accessibility"):
self._convert_accessibility(node)
# Output the newly created root objects and sort them
# by attribute id
# FIXME: Use sorted(self.root_objects,
# key=lambda n: n.getAttribute('id'),
# reverse=True):
# when we can depend on python 2.4 or higher
root_objects = self.root_objects[:]
root_objects.sort(lambda a, b: cmp(b.getAttribute('id'),
a.getAttribute('id')))
for obj in root_objects:
self._interface.childNodes.insert(0, obj)
def _convert(self, klass, node):
if klass == 'GtkNotebook':
self._packing_prop_to_child_attr(node, "type", "tab")
elif klass in ['GtkExpander', 'GtkFrame']:
self._packing_prop_to_child_attr(
node, "type", "label_item", "label")
elif klass == "GtkMenuBar":
self._convert_menu(node)
elif klass == "GtkMenu":
# Only convert toplevel popups
if node.parentNode == self._interface:
self._convert_menu(node, popup=True)
elif klass in WINDOWS and self.skip_windows:
self._remove_window(node)
if self.target_version == "3.0":
if klass == "GtkComboBoxEntry":
node.setAttribute("class","GtkComboBox")
prop = self._dom.createElement("property")
prop.setAttribute("name", "has-entry")
prop.appendChild(self._dom.createTextNode("True"))
node.appendChild(prop)
elif klass == "GtkDialog":
for child in node.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
if child.tagName != 'property':
continue
if (child.getAttribute("name") not in ("has-separator", "has_separator")):
continue;
node.removeChild(child)
break
self._default_widget_converter(node)
def _default_widget_converter(self, node):
klass = node.getAttribute("class")
for prop in get_property_nodes(node):
prop_name = prop.getAttribute("name")
if prop_name == "sizegroup":
self._convert_sizegroup(node, prop)
elif prop_name == "tooltip" and klass != "GtkAction":
prop.setAttribute("name", "tooltip-text")
elif prop_name in ["response_id", 'response-id']:
# It does not make sense to convert responses when
# we're not going to output dialogs
if self.skip_windows:
continue
object_id = node.getAttribute('id')
response = prop.childNodes[0].data
self._convert_dialog_response(node, object_id, response)
prop.parentNode.removeChild(prop)
elif prop_name == "adjustment":
self._convert_adjustment(prop)
elif prop_name == "items" and klass in ['GtkComboBox',
'GtkComboBoxEntry']:
self._convert_combobox_items(node, prop)
elif prop_name == "text" and klass == 'GtkTextView':
self._convert_textview_text(prop)
def _remove_window(self, node):
object_node = get_object_node(get_child_nodes(node)[0])
parent = node.parentNode
parent.removeChild(node)
parent.appendChild(object_node)
def _convert_menu(self, node, popup=False):
if node.hasAttribute('constructor'):
return
uimgr = self._create_root_object('GtkUIManager',
template='uimanager')
if popup:
name = 'popup'
else:
name = 'menubar'
menu = self._dom.createElement(name)
menu.setAttribute('name', node.getAttribute('id'))
node.setAttribute('constructor', uimgr.getAttribute('id'))
for child in get_child_nodes(node):
obj_node = get_object_node(child)
item = self._convert_menuitem(uimgr, obj_node)
menu.appendChild(item)
child.removeChild(obj_node)
child.parentNode.removeChild(child)
ui = self._dom.createElement('ui')
uimgr.appendChild(ui)
ui.appendChild(menu)
def _convert_menuitem(self, uimgr, obj_node):
children = get_child_nodes(obj_node)
name = 'menuitem'
if children:
child_node = children[0]
menu_node = get_object_node(child_node)
# Can be GtkImage, which will take care of later.
if menu_node.getAttribute('class') == 'GtkMenu':
name = 'menu'
object_class = obj_node.getAttribute('class')
if object_class in ['GtkMenuItem',
'GtkImageMenuItem',
'GtkCheckMenuItem',
'GtkRadioMenuItem']:
menu = self._dom.createElement(name)
elif object_class == 'GtkSeparatorMenuItem':
return self._dom.createElement('separator')
else:
raise NotImplementedError(object_class)
menu.setAttribute('action', obj_node.getAttribute('id'))
self._add_action_from_menuitem(uimgr, obj_node)
if children:
for child in get_child_nodes(menu_node):
obj_node = get_object_node(child)
item = self._convert_menuitem(uimgr, obj_node)
menu.appendChild(item)
child.removeChild(obj_node)
child.parentNode.removeChild(child)
return menu
def _menuitem_to_action(self, node, properties):
copy_properties(node, ['label', 'tooltip'], properties)
def _togglemenuitem_to_action(self, node, properties):
self._menuitem_to_action(node, properties)
copy_properties(node, ['active'], properties)
def _radiomenuitem_to_action(self, node, properties):
self._togglemenuitem_to_action(node, properties)
copy_properties(node, ['group'], properties)
def _add_action_from_menuitem(self, uimgr, node):
properties = {}
object_class = node.getAttribute('class')
object_id = node.getAttribute('id')
if object_class == 'GtkMenuItem':
name = 'GtkAction'
self._menuitem_to_action(node, properties)
elif object_class == 'GtkCheckMenuItem':
name = 'GtkToggleAction'
self._togglemenuitem_to_action(node, properties)
elif object_class == 'GtkRadioMenuItem':
name = 'GtkRadioAction'
self._radiomenuitem_to_action(node, properties)
elif object_class == 'GtkImageMenuItem':
name = 'GtkAction'
children = get_child_nodes(node)
if (children and
children[0].getAttribute('internal-child') == 'image'):
image = get_object_node(children[0])
child = get_property_node(image, 'stock')
if child is not None:
properties['stock_id'] = child
self._menuitem_to_action(node, properties)
elif object_class == 'GtkSeparatorMenuItem':
return
else:
raise NotImplementedError(object_class)
if get_property(node, 'use_stock') == 'True':
if 'label' in properties:
properties['stock_id'] = properties['label']
del properties['label']
properties['name'] = object_id
action = self._create_object(name,
object_id,
properties=properties)
for signal in get_signal_nodes(node):
signal_name = signal.getAttribute('name')
if signal_name in ['activate', 'toggled']:
action.appendChild(signal)
else:
print 'Unhandled signal %s::%s' % (node.getAttribute('class'),
signal_name)
if not uimgr.childNodes:
child = self._dom.createElement('child')
uimgr.appendChild(child)
group = self._create_object('GtkActionGroup', None,
template='actiongroup')
child.appendChild(group)
else:
group = uimgr.childNodes[0].childNodes[0]
child = self._dom.createElement('child')
group.appendChild(child)
child.appendChild(action)
for accelerator in get_accelerator_nodes(node):
signal_name = accelerator.getAttribute('signal')
if signal_name != 'activate':
print 'Unhandled accelerator signal for %s::%s' % (
node.getAttribute('class'), signal_name)
continue
accelerator.removeAttribute('signal')
child.appendChild(accelerator)
def _convert_sizegroup(self, node, prop):
# This is Gazpacho only
node.removeChild(prop)
obj = self._get_object(prop.childNodes[0].data)
if obj is None:
widgets = self._get_objects_by_attr("class", "GtkSizeGroup")
if widgets:
obj = widgets[-1]
else:
obj = self._create_root_object('GtkSizeGroup',
template='sizegroup')
widgets = obj.getElementsByTagName("widgets")
if widgets:
assert len(widgets) == 1
widgets = widgets[0]
else:
widgets = self._dom.createElement("widgets")
obj.appendChild(widgets)
member = self._dom.createElement("widget")
member.setAttribute("name", node.getAttribute("id"))
widgets.appendChild(member)
def _convert_dialog_response(self, node, object_name, response):
# 1) Get parent dialog node
while True:
# If we can't find the parent dialog, give up
if node == self._dom:
return
if (node.tagName == 'object' and
node.getAttribute('class') in DIALOGS):
dialog = node
break
node = node.parentNode
assert node
# 2) Get dialogs action-widgets tag, create if not found
for child in dialog.childNodes:
if child.nodeType != Node.ELEMENT_NODE:
continue
if child.tagName == 'action-widgets':
actions = child
break
else:
actions = self._dom.createElement("action-widgets")
dialog.appendChild(actions)
# 3) Add action-widget tag for the response
action = self._dom.createElement("action-widget")
action.setAttribute("response", response)
action.appendChild(self._dom.createTextNode(object_name))
actions.appendChild(action)
def _convert_adjustment(self, prop):
properties = {}
if prop.childNodes:
data = prop.childNodes[0].data
value, lower, upper, step, page, page_size = data.split(' ')
properties.update(value=value,
lower=lower,
upper=upper,
step_increment=step,
page_increment=page,
page_size=page_size)
else:
prop.appendChild(self._dom.createTextNode(""))
adj = self._create_root_object("GtkAdjustment",
template='adjustment',
properties=properties)
prop.childNodes[0].data = adj.getAttribute('id')
def _convert_combobox_items(self, node, prop):
parent = prop.parentNode
if not prop.childNodes:
parent.removeChild(prop)
return
translatable_attr = prop.attributes.get('translatable')
translatable = translatable_attr is not None and translatable_attr.value == 'yes'
has_context_attr = prop.attributes.get('context')
has_context = has_context_attr is not None and has_context_attr.value == 'yes'
comments_attr = prop.attributes.get('comments')
comments = comments_attr is not None and comments_attr.value or None
value = prop.childNodes[0].data
model = self._create_root_object("GtkListStore",
template="model")
columns = self._dom.createElement('columns')
model.appendChild(columns)
column = self._dom.createElement('column')
column.setAttribute('type', 'gchararray')
columns.appendChild(column)
data = self._dom.createElement('data')
model.appendChild(data)
if value.endswith('\n'):
value = value[:-1]
for item in value.split('\n'):
row = self._dom.createElement('row')
data.appendChild(row)
col = self._dom.createElement('col')
col.setAttribute('id', '0')
if translatable:
col.setAttribute('translatable', 'yes')
if has_context:
splitting = item.split('|', 1)
if len(splitting) == 2:
context, item = splitting
col.setAttribute('context', context)
if comments is not None:
col.setAttribute('comments', comments)
col.appendChild(self._dom.createTextNode(item))
row.appendChild(col)
model_prop = self._dom.createElement('property')
model_prop.setAttribute('name', 'model')
model_prop.appendChild(
self._dom.createTextNode(model.getAttribute('id')))
parent.appendChild(model_prop)
parent.removeChild(prop)
child = self._dom.createElement('child')
node.appendChild(child)
cell_renderer = self._create_object('GtkCellRendererText', None,
template='renderer')
child.appendChild(cell_renderer)
attributes = self._dom.createElement('attributes')
child.appendChild(attributes)
attribute = self._dom.createElement('attribute')
attributes.appendChild(attribute)
attribute.setAttribute('name', 'text')
attribute.appendChild(self._dom.createTextNode('0'))
def _convert_textview_text(self, prop):
if not prop.childNodes:
prop.parentNode.removeChild(prop)
return
data = prop.childNodes[0].data
if prop.hasAttribute('translatable'):
prop.removeAttribute('translatable')
tbuffer = self._create_root_object("GtkTextBuffer",
template='textbuffer',
properties=dict(text=data))
prop.childNodes[0].data = tbuffer.getAttribute('id')
prop.setAttribute('name', 'buffer')
def _packing_prop_to_child_attr(self, node, prop_name, prop_val,
attr_val=None):
for child in get_child_nodes(node):
packing_props = [p for p in child.childNodes if p.nodeName == "packing"]
if not packing_props:
continue
assert len(packing_props) == 1
packing_prop = packing_props[0]
properties = packing_prop.getElementsByTagName("property")
for prop in properties:
if (prop.getAttribute("name") != prop_name or
prop.childNodes[0].data != prop_val):
continue
packing_prop.removeChild(prop)
child.setAttribute(prop_name, attr_val or prop_val)
if len(properties) == 1:
child.removeChild(packing_prop)
def _convert_ui(self, node):
cdata = node.childNodes[0]
data = cdata.toxml().strip()
if not data.startswith("<![CDATA[") or not data.endswith("]]>"):
return
data = data[9:-3]
child = minidom.parseString(data).childNodes[0]
nodes = child.childNodes[:]
for child_node in nodes:
node.appendChild(child_node)
node.removeChild(cdata)
if not node.hasAttribute("id"):
return
# Updating references made by widgets
parent_id = node.parentNode.getAttribute("id")
for widget in self._get_objects_by_attr("constructor",
node.getAttribute("id")):
widget.getAttributeNode("constructor").value = parent_id
node.removeAttribute("id")
def _convert_accessibility(self, node):
objectNode = node.parentNode
parent_id = objectNode.getAttribute("id")
properties = {}
for node in node.childNodes:
if node.nodeName == 'atkproperty':
node.tagName = 'property'
properties[node.getAttribute('name')] = node
node.parentNode.removeChild(node)
elif node.nodeName == 'atkrelation':
node.tagName = 'relation'
relation_type = node.getAttribute('type')
relation_type = relation_type.replace('_', '-')
node.setAttribute('type', relation_type)
elif node.nodeName == 'atkaction':
node.tagName = 'action'
if properties:
child = self._dom.createElement('child')
child.setAttribute("internal-child", "accessible")
atkobject = self._create_object(
"AtkObject", None,
template='a11y-%s' % (parent_id,),
properties=properties)
child.appendChild(atkobject)
objectNode.appendChild(child)
def _strip_root(self, root_name):
for widget in self._dom.getElementsByTagName("widget"):
if widget.getAttribute('id') == root_name:
break
else:
raise SystemExit("Could not find an object called `%s'" % (
root_name))
for child in self._interface.childNodes[:]:
if child.nodeType != Node.ELEMENT_NODE:
continue
child.parentNode.removeChild(child)
self._interface.appendChild(widget)
def _indent(output):
if not subprocess:
return output
for directory in os.environ['PATH'].split(os.pathsep):
filename = os.path.join(directory, 'xmllint')
if os.path.exists(filename):
break
else:
return output
s = subprocess.Popen([filename, '--format', '-'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
s.stdin.write(output)
s.stdin.close()
return s.stdout.read()
def usage():
print __doc__
def main(args):
try:
opts, args = getopt.getopt(args[1:], "hwr:",
["help",
"skip-windows",
"target-version=",
"root="])
except getopt.GetoptError:
usage()
return 2
if len(args) != 2:
usage()
return 2
input_filename, output_filename = args
skip_windows = False
split = False
root = None
target_version = "2.0"
for o, a in opts:
if o in ("-h", "--help"):
usage()
sys.exit()
elif o in ("-r", "--root"):
root = a
elif o in ("-w", "--skip-windows"):
skip_windows = True
elif o in ("-t", "--target-version"):
target_version = a
conv = GtkBuilderConverter(skip_windows=skip_windows,
target_version=target_version,
root=root)
conv.parse_file(input_filename)
xml = _indent(conv.to_xml())
if output_filename == "-":
print xml
else:
open(output_filename, 'w').write(xml)
print "Wrote", output_filename
return 0
if __name__ == "__main__":
sys.exit(main(sys.argv))

Binary file not shown.

View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0"
processorArchitecture="AMD64"
name="gtk-update-icon-cache.exe"
type="win32"/>
<!-- Identify the application security requirements. -->
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel
level="asInvoker"
uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,159 @@
#!/bin/bash
# ---------------------------------------------------------------------------
# Set default values to option vars
# ---------------------------------------------------------------------------
set -e
INSTALL_SRC_DIR=$(dirname "$0")
INSTALL_SRC_MSYS2="/mingw64/"
_DATE=$(date +'%Y-%m-%d')
_VERSION="3.20.2"
_ARCH="win64"
# ---------------------------------------------------------------------------
# Check source directory and prepare binary and lib destination directory
# in the NSIS source tree
# ---------------------------------------------------------------------------
test "${INSTALL_SRC_DIR}" = "." && INSTALL_SRC_DIR=${PWD}
INSTALL_SRC_BIN="${INSTALL_SRC_DIR}"/bin
INSTALL_SRC_LIB="${INSTALL_SRC_DIR}"/lib
INSTALL_SRC_MSYS2_BIN=${INSTALL_SRC_MSYS2}/bin
INSTALL_SRC_MSYS2_LIB=${INSTALL_SRC_MSYS2}/lib
# Create installer file name
INSTALLER_FILENAME=gtk3-runtime-${_VERSION}-${_DATE}-${_ARCH}.msi
echo $INSTALLER_FILENAME
# ---------------------------------------------------------------------------
# Copy relevant GTK files to the binary destination directory
# ---------------------------------------------------------------------------
echo "Copying all GTK files from : " $INSTALL_SRC_MSYS2
echo " to NSIS source directory: " $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libatk-1.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libatkmm-1.6-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libcairo-2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libcairo-gobject-2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libcairo-script-interpreter-2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libcairomm-1.0-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libepoxy-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libexslt-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libffi-6.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libfontconfig-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libfreetype-6.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgailutil-3-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgailutil-18.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgdk_pixbuf-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/liblzma-5.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libcroco-0.6-3.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgdk-win32-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgdk-3-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgdkmm-3.0-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgdkmm-2.4-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgio-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libglib-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libglibmm-2.4-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgiomm-2.4-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libsigc-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libglibmm_generate_extra_defs-2.4-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgmodule-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgobject-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgthread-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgtk-3-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgtk-win32-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgtksourceview-3.0-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgtksourceview-2.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgtksourceviewmm-3.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgtkmm-3.0-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgtkmm-2.4-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libharfbuzz-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libintl-8.dll $INSTALL_SRC_BIN
# I'm not sure that this is needed...:
cp $INSTALL_SRC_MSYS2_BIN/libiconv-2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libjson-glib-1.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpango-1.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpangocairo-1.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpangowin32-1.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpangoft2-1.0-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpangomm-1.4-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpixman-1-0.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpng16-16.dll $INSTALL_SRC_BIN
# No need for this IMHO, at least fontconfig is not dependent on these
cp $INSTALL_SRC_MSYS2_BIN/libxml++-2.6-2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libxml++-3.0-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libxml2-2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libxslt-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libpcre-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/zlib1.dll $INSTALL_SRC_BIN
# These six additional one seems to me that is needed for my test GTK app,
# as I see mainly needed for fontconfig package and dlls
cp $INSTALL_SRC_MSYS2_BIN/libexpat-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libbz2-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgraphite2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/librsvg-2-2.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libtiff-5.dll $INSTALL_SRC_BIN
# Standrard MSYS2 libraries
cp $INSTALL_SRC_MSYS2_BIN/libstdc++-6.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libgcc_s_seh-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/libwinpthread-1.dll $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-cache.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-cat.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-list.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-match.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-pattern.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-query.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-scan.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/fc-validate.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/gdk-pixbuf-query-loaders.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/gspawn-win64-helper.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/gspawn-win64-helper-console.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/gtk-query-immodules-2.0.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/gtk-query-immodules-3.0.exe $INSTALL_SRC_BIN
cp $INSTALL_SRC_MSYS2_BIN/gtk-update-icon-cache.exe $INSTALL_SRC_BIN
# Copy lib/gtk-2.0 folder
cd $INSTALL_SRC_MSYS2_LIB/gtk-2.0
cp -r ./ $INSTALL_SRC_LIB/gtk-2.0
# Delete static libraries
find $INSTALL_SRC_LIB/gtk-2.0 -name *.dll.a -type f -delete
# Copy lib/gdk-pixbuf-2.0 folder
cd $INSTALL_SRC_MSYS2_LIB/gdk-pixbuf-2.0
cp -r ./ $INSTALL_SRC_LIB/gdk-pixbuf-2.0
# Delete static libraries
find $INSTALL_SRC_LIB/gdk-pixbuf-2.0 -name *.a -type f -delete
# Copy /share/locale/locale.alias
cp $INSTALL_SRC_MSYS2/share/locale/locale.alias $INSTALL_SRC_DIR/share/locale
# Copy /share/themes/default
cp -r $INSTALL_SRC_MSYS2/share/themes/default/gtk-3.0 $INSTALL_SRC_DIR/share/themes/default/
# Copy /share/themes/emacs
cp -r $INSTALL_SRC_MSYS2/share/themes/emacs/gtk-3.0 $INSTALL_SRC_DIR/share/themes/emacs/
# Copy /share/glib-2.0/schemas
cp -r $INSTALL_SRC_MSYS2/share/glib-2.0/schemas $INSTALL_SRC_DIR/share/glib-2.0/
# Copy /share/icons
cp -r $INSTALL_SRC_MSYS2/share/icons $INSTALL_SRC_DIR/share/
# librsvg depends on:
# gdk-pixbuf2 pango libcroco
# gdk-pixbuf2 package depends on the following:
# glib2>=2.37.2 jasper libjpeg-turbo libpng libtiff
echo "Done with copying all binary relevant GTK files to the binary destination directory"
echo "Now you can initiate the creation of the installer package with NSIS"

View File

@ -1,3 +1,7 @@
[Settings]
gtk-theme-name = gtk-win32
gtk-theme-name = win32
gtk-icon-theme-name = Adwaita
gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle=hintfull
gtk-xft-rgba=rgb

View File

@ -12,9 +12,9 @@
; should be installable side by side with this package.
!define GTK_VERSION "2.24.30"
!define GTK_VERSION "2.24.31"
!define GTK_BIN_VERSION "2.10.0"
!define PRODUCT_VERSION "${GTK_VERSION}-2016-04-09-ts-win64"
!define PRODUCT_VERSION "${GTK_VERSION}-2017-02-20-ts-win64"
!define PRODUCT_NAME "GTK2-Runtime Win64"
!define PRODUCT_PUBLISHER "Tom Schoonjans"
!define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@ -90,7 +90,7 @@ ShowUnInstDetails show
; Only useful for BZIP2 compression
ReserveFile "nsi_pathpage.ini"
ReserveFile "nsi_configpage.ini"
ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
ReserveFile "${NSISDIR}\Plugins\x86-unicode\InstallOptions.dll"
; Pages to show during installation
@ -258,10 +258,10 @@ SectionIn 1 2 RO
File bin\libgtk-win32-2.0-0.dll ; gtk
File bin\libgtksourceview-2.0-0.dll
File bin\libgtkmm-2.4-1.dll
File bin\libgtksourceviewmm-2.0-2.dll
;File bin\libgtksourceviewmm-2.0-2.dll
File bin\libharfbuzz-0.dll
File bin\libintl-8.dll ; gettext, needed by all i18n libs
File bin\iconv.dll
File bin\libiconv-2.dll
File bin\libjson-glib-1.0-0.dll ; gettext, needed by all i18n libs
File bin\libpango-1.0-0.dll ; pango, needed by gtk
File bin\libpangocairo-1.0-0.dll ; pango, needed by gtk
@ -276,9 +276,14 @@ SectionIn 1 2 RO
File bin\libxml2-2.dll ; fontconfig needs this
File bin\libxslt-1.dll ; fontconfig needs this
File bin\zlib1.dll ; png and many others need this
File bin\libstdc++_64-6.dll
File bin\libgcc_s_seh_64-1.dll
File bin\libwinpthread_64-1.dll
File bin\libexpat-1.dll ; required by fontconfig
File bin\libbz2-1.dll ; required by fontconfig
File bin\libgraphite2.dll ; required by harfbuzz
File bin\librsvg-2-2.dll ; required by adwaita-icon-theme
File bin\libtiff-5.dll ; required by gdk-pixbuf2
File bin\libstdc++-6.dll
File bin\libgcc_s_seh-1.dll
File bin\libwinpthread-1.dll
; We install this into the same place as the DLLs to avoid any PATH manipulation.
SetOutPath "$LIB_INSTDIR"
@ -306,8 +311,8 @@ SectionIn 1 2 RO
SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}"
File lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders.cache
; SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders"
; File /r lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders
SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders"
File /r lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders
SetOutPath "$INSTDIR\lib\gtk-2.0\modules"
File /r lib\gtk-2.0\modules
@ -342,8 +347,8 @@ SectionIn 1 2 RO
; this script updates some config files, but it's unsafe
; (gtk or pango may not work afterwards), so don't call it.
Push $INSTDIR\gtk2-runtime\gtk-postinstall.bat
Call WritePostInstall
;Push $INSTDIR\gtk2-runtime\gtk-postinstall.bat
;Call WritePostInstall
; update pango.modules, not working for now
; Exec '$INSTDIR\gtk2-runtime\gtk-postinstall.bat'
@ -608,11 +613,11 @@ Function un.DeleteDlls
Delete $LIB_INSTDIR\libgthread-2.0-0.dll ; from glib
Delete $LIB_INSTDIR\libgtk-win32-2.0-0.dll ; gtk
Delete $LIB_INSTDIR\libgtksourceview-2.0-0.dll
Delete $LIB_INSTDIR\libgtksourceviewmm-2.0-2.dll
;Delete $LIB_INSTDIR\libgtksourceviewmm-2.0-2.dll
Delete $LIB_INSTDIR\libgtkmm-2.4-1.dll
Delete $LIB_INSTDIR\libharfbuzz-0.dll
Delete $LIB_INSTDIR\libintl-8.dll ; gettext, needed by all i18n libs
Delete $LIB_INSTDIR\iconv.dll
Delete $LIB_INSTDIR\libiconv-2.dll
Delete $LIB_INSTDIR\libjson-glib-1.0-0.dll
Delete $LIB_INSTDIR\libpango-1.0-0.dll ; pango, needed by gtk
Delete $LIB_INSTDIR\libpangocairo-1.0-0.dll ; pango, needed by gtk
@ -627,9 +632,14 @@ Function un.DeleteDlls
Delete $LIB_INSTDIR\libxml++-3.0-1.dll
Delete $LIB_INSTDIR\libpcre-1.dll
Delete $LIB_INSTDIR\zlib1.dll ; png and many others need this
Delete $LIB_INSTDIR\libstdc++_64-6.dll
Delete $LIB_INSTDIR\libgcc_s_seh_64-1.dll
Delete $LIB_INSTDIR\libwinpthread_64-1.dll
Delete $LIB_INSTDIR\libexpat-1.dll
Delete $LIB_INSTDIR\libbz2-1.dll
Delete $LIB_INSTDIR\libgraphite2.dll
Delete $LIB_INSTDIR\librsvg-2-2.dll
Delete $LIB_INSTDIR\libtiff-5.dll
Delete $LIB_INSTDIR\libstdc++-6.dll
Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
Delete $LIB_INSTDIR\libwinpthread-1.dll
FunctionEnd
@ -762,7 +772,7 @@ Section Uninstall
; RMDir /r "$INSTDIR\lib\pango"
Delete "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders.cache"
; RMDir "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders" ; not forced
RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders" ; not forced
RMDir "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}" ; not forced
RMDir "$INSTDIR\lib\gdk-pixbuf-2.0" ; not forced

View File

@ -11,9 +11,9 @@
; Directory and package names: gtk3-runtime.
!define GTK_VERSION "3.20.2"
!define GTK_VERSION "3.22.8"
!define GTK_BIN_VERSION "3.0.0"
!define PRODUCT_VERSION "${GTK_VERSION}-2016-04-09-ts-win64"
!define PRODUCT_VERSION "${GTK_VERSION}-2017-02-20-ts-win64"
!define PRODUCT_NAME "GTK3-Runtime Win64"
!define PRODUCT_PUBLISHER "Tom Schoonjans"
!define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@ -89,7 +89,7 @@ ShowUnInstDetails show
; Only useful for BZIP2 compression
ReserveFile "nsi_pathpage.ini"
ReserveFile "nsi_configpage.ini"
ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
ReserveFile "${NSISDIR}\Plugins\x86-unicode\InstallOptions.dll"
; Pages to show during installation
@ -231,54 +231,61 @@ SectionIn 1 2 RO
; NOTE: If you add or remove any of these,
; be sure to do the same in the uninstall section.
File bin\libatk-1.0-0.dll ; atk
File bin\libatkmm-1.6-1.dll ; atk
File bin\libcairo-2.dll ; cairo, needed by gtk
File bin\libcairo-gobject-2.dll ; cairo. Doesn't seem to be required, but since we're distributing cairo...
File bin\libatk-1.0-0.dll ; atk
File bin\libatkmm-1.6-1.dll ; atk
File bin\libcairo-2.dll ; cairo, needed by gtk
File bin\libcairo-gobject-2.dll ; cairo. Doesn't seem to be required, but since we're distributing cairo...
File bin\libcairo-script-interpreter-2.dll ; cairo. Doesn't seem to be required, but since we're distributing cairo...
File bin\libcairomm-1.0-1.dll
File bin\libepoxy-0.dll
File bin\libexslt-0.dll
File bin\libffi-6.dll ; libffi is required by glib
File bin\libfontconfig-1.dll ; fontconfig is needed for ft2 pango backend
File bin\libfreetype-6.dll ; freetype is needed for ft2 pango backend
File bin\libgailutil-3-0.dll ; from gtk
File bin\libffi-6.dll ; libffi is required by glib2
File bin\libfontconfig-1.dll ; fontconfig is needed for ft2 pango backend
File bin\libfreetype-6.dll ; freetype is needed for ft2 pango backend
File bin\libgailutil-3-0.dll ; from gtk
File bin\libgdk_pixbuf-2.0-0.dll ; from gtk
File bin\libgdk-3-0.dll ; from gtk
File bin\liblzma-5.dll ; from gtk
File bin\libcroco-0.6-3.dll ; from gtk
File bin\libgdk-3-0.dll ; from gtk
File bin\libgdkmm-3.0-1.dll
File bin\libgio-2.0-0.dll ; from glib
File bin\libglib-2.0-0.dll ; glib
File bin\libglibmm-2.4-1.dll ; glib
File bin\libgiomm-2.4-1.dll ; glib
File bin\libgio-2.0-0.dll ; from glib
File bin\libglib-2.0-0.dll ; glib
File bin\libglibmm-2.4-1.dll ; glib
File bin\libgiomm-2.4-1.dll ; glib
File bin\libsigc-2.0-0.dll
File bin\libglibmm_generate_extra_defs-2.4-1.dll ; glib
File bin\libgmodule-2.0-0.dll ; from glib
File bin\libgobject-2.0-0.dll ; from glib
File bin\libgthread-2.0-0.dll ; from glib
File bin\libgmodule-2.0-0.dll ; from glib
File bin\libgobject-2.0-0.dll ; from glib
File bin\libgthread-2.0-0.dll ; from glib
File bin\libgtk-3-0.dll ; gtk
File bin\libgtksourceview-3.0-1.dll
File bin\libgtksourceviewmm-3.0-0.dll
File bin\libgtkmm-3.0-1.dll
File bin\libharfbuzz-0.dll
File bin\libintl-8.dll ; gettext, needed by all i18n libs
File bin\iconv.dll
File bin\libjson-glib-1.0-0.dll ; gettext, needed by all i18n libs
File bin\libpango-1.0-0.dll ; pango, needed by gtk
File bin\libharfbuzz-0.dll ; required by pango
File bin\libintl-8.dll ; gettext, needed by all i18n libs
File bin\libiconv-2.dll ; required by fontconfig
File bin\libjson-glib-1.0-0.dll ; gettext, needed by all i18n libs
File bin\libpango-1.0-0.dll ; pango, needed by gtk
File bin\libpangocairo-1.0-0.dll ; pango, needed by gtk
File bin\libpangowin32-1.0-0.dll ; pango, needed by gtk
File bin\libpangoft2-1.0-0.dll ; pango, needed by gtk
File bin\libpangoft2-1.0-0.dll ; pango, needed by gtk
File bin\libpangomm-1.4-1.dll
File bin\libpixman-1-0.dll ; libpixman, needed by cairo
File bin\libpng16-16.dll ; for gdk_pixbuf loader.
File bin\libpixman-1-0.dll ; libpixman, needed by cairo
File bin\libpng16-16.dll ; required by gdk-pixbuf2
File bin\libxml++-2.6-2.dll ; fontconfig needs this
File bin\libxml++-3.0-1.dll
File bin\libxml2-2.dll ; fontconfig needs this
File bin\libxslt-1.dll ; fontconfig needs this
File bin\libpcre-1.dll ; fontconfig needs this
File bin\zlib1.dll ; png and many others need this
File bin\libstdc++_64-6.dll
File bin\libgcc_s_seh_64-1.dll
File bin\libwinpthread_64-1.dll
File bin\libxml2-2.dll ; fontconfig needs this
File bin\libxslt-1.dll ; fontconfig needs this
File bin\libpcre-1.dll ; fontconfig needs this
File bin\zlib1.dll ; png and many others need this
File bin\libexpat-1.dll ; required by fontconfig
File bin\libbz2-1.dll ; required by fontconfig
File bin\libgraphite2.dll ; required by harfbuzz
File bin\librsvg-2-2.dll ; required by adwaita-icon-theme
File bin\libtiff-5.dll ; required by gdk-pixbuf2
File bin\libstdc++-6.dll ; standard MSYS2 library
File bin\libgcc_s_seh-1.dll ; standard MSYS2 library
File bin\libwinpthread-1.dll ; standard MSYS2 library
; We install this into the same place as the DLLs to avoid any PATH manipulation.
SetOutPath "$LIB_INSTDIR"
@ -306,8 +313,8 @@ SectionIn 1 2 RO
SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0"
File lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
; SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders"
; File /r lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders
SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0\"
File /r lib\gdk-pixbuf-2.0\2.10.0\loaders
;SetOutPath "$INSTDIR\lib\gtk-3.0\${GTK_BIN_VERSION}"
; no longer in gtk as of 2.14.5.
@ -316,10 +323,10 @@ SectionIn 1 2 RO
; File /r lib\gtk-2.0\${GTK_BIN_VERSION}\loaders
; wimp
;SetOutPath "$INSTDIR\lib\gtk-2.0\${GTK_BIN_VERSION}\engines"
;File lib\gtk-2.0\${GTK_BIN_VERSION}\engines\libwimp*.dll
; SetOutPath "$INSTDIR\lib\gtk-2.0\${GTK_BIN_VERSION}\engines"
; File lib\gtk-2.0\${GTK_BIN_VERSION}\engines\libwimp*.dll
; We install this, but other installers may not have it.
;File lib\gtk-2.0\${GTK_BIN_VERSION}\engines\libpixmap*.dll
; File lib\gtk-2.0\${GTK_BIN_VERSION}\engines\libpixmap*.dll
SetOutPath "$INSTDIR\share\locale"
File share\locale\locale.alias ; from gettext
@ -343,8 +350,8 @@ SectionIn 1 2 RO
; this script updates some config files, but it's unsafe
; (gtk or pango may not work afterwards), so don't call it.
Push $INSTDIR\gtk3-runtime\gtk-postinstall.bat
Call WritePostInstall
; Push $INSTDIR\gtk3-runtime\gtk-postinstall.bat
; Call WritePostInstall
; update pango.modules, not working for now
; Exec '$INSTDIR\gtk2-runtime\gtk-postinstall.bat'
@ -597,6 +604,8 @@ Function un.DeleteDlls
Delete $LIB_INSTDIR\libfreetype-6.dll ; freetype is needed for ft2 pango backend
Delete $LIB_INSTDIR\libgailutil-3-0.dll ; from gtk
Delete $LIB_INSTDIR\libgdk_pixbuf-2.0-0.dll ; from gtk
Delete $LIB_INSTDIR\liblzma-5.dll ; from gtk
Delete $LIB_INSTDIR\libcroco-0.6-3.dll ; from gtk
Delete $LIB_INSTDIR\libgdk-3-0.dll ; from gtk
Delete $LIB_INSTDIR\libgdkmm-3.0-1.dll
Delete $LIB_INSTDIR\libgio-2.0-0.dll ; from glib
@ -614,7 +623,7 @@ Function un.DeleteDlls
Delete $LIB_INSTDIR\libgtkmm-3.0-1.dll
Delete $LIB_INSTDIR\libharfbuzz-0.dll
Delete $LIB_INSTDIR\libintl-8.dll ; gettext, needed by all i18n libs
Delete $LIB_INSTDIR\iconv.dll
Delete $LIB_INSTDIR\libiconv-2.dll
Delete $LIB_INSTDIR\libjson-glib-1.0-0.dll
Delete $LIB_INSTDIR\libpango-1.0-0.dll ; pango, needed by gtk
Delete $LIB_INSTDIR\libpangocairo-1.0-0.dll ; pango, needed by gtk
@ -629,9 +638,14 @@ Function un.DeleteDlls
Delete $LIB_INSTDIR\libxml++-2.6-2.dll ; fontconfig needs this
Delete $LIB_INSTDIR\libxml++-3.0-1.dll
Delete $LIB_INSTDIR\zlib1.dll ; png and many others need this
Delete $LIB_INSTDIR\libstdc++_64-6.dll
Delete $LIB_INSTDIR\libgcc_s_seh_64-1.dll
Delete $LIB_INSTDIR\libwinpthread_64-1.dll
Delete $LIB_INSTDIR\libexpat-1.dll
Delete $LIB_INSTDIR\libbz2-1.dll
Delete $LIB_INSTDIR\libgraphite2.dll
Delete $LIB_INSTDIR\librsvg-2-2.dll
Delete $LIB_INSTDIR\libtiff-5.dll
Delete $LIB_INSTDIR\libstdc++-6.dll
Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
Delete $LIB_INSTDIR\libwinpthread-1.dll
FunctionEnd
@ -765,7 +779,7 @@ Section Uninstall
; RMDir /r "$INSTDIR\lib\pango"
Delete "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"
; RMDir "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders" ; not forced
RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0\loaders" ; not forced
RMDir "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0" ; not forced
RMDir "$INSTDIR\lib\gdk-pixbuf-2.0" ; not forced

View File

@ -1,6 +1,100 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.31.1
# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.5
#
# dynamic loading of modules not supported
# LoaderDir = C:\msys64\mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders
#
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ani.dll"
"ani" 4 "gdk-pixbuf" "Windows animated cursor" "LGPL"
"application/x-navi-animation" ""
"ani" ""
"RIFF ACON" " xxxx " 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-bmp.dll"
"bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-gif.dll"
"gif" 4 "gdk-pixbuf" "GIF" "LGPL"
"image/gif" ""
"gif" ""
"GIF8" "" 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-icns.dll"
"icns" 4 "gdk-pixbuf" "MacOS X icon" "GPL"
"image/x-icns" ""
"icns" ""
"icns" "" 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ico.dll"
"ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
"image/x-icon" "image/x-ico" "image/x-win-bitmap" "image/vnd.microsoft.icon" "application/ico" "image/ico" "image/icon" "text/ico" ""
"ico" "cur" ""
" \001 " "zz znz" 100
" \002 " "zz znz" 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jpeg.dll"
"jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
"image/jpeg" ""
"jpeg" "jpe" "jpg" ""
"\377\330" "" 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-pnm.dll"
"pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
"pnm" "pbm" "pgm" "ppm" ""
"P1" "" 100
"P2" "" 100
"P3" "" 100
"P4" "" 100
"P5" "" 100
"P6" "" 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-qtif.dll"
"qtif" 4 "gdk-pixbuf" "QuickTime" "LGPL"
"image/x-quicktime" "image/qtif" ""
"qtif" "qif" ""
"abcdidsc" "xxxx " 100
"abcdidat" "xxxx " 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-svg.dll"
"svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
"image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" ""
"svg" "svgz" "svg.gz" ""
" <svg" "* " 100
" <!DOCTYPE svg" "* " 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-tga.dll"
"tga" 4 "gdk-pixbuf" "Targa" "LGPL"
"image/x-tga" ""
"tga" "targa" ""
" \001\001" "x " 100
" \001\t" "x " 100
" \002" "xz " 99
" \003" "xz " 100
" \n" "xz " 100
" \v" "xz " 100
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-tiff.dll"
"tiff" 5 "gdk-pixbuf" "TIFF" "LGPL"
"image/tiff" ""
"tiff" "tif" ""
"MM *" " z " 100
"II* " " z" 100
"II* \020 CR\002 " " z zzz z" 0
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-xbm.dll"
"xbm" 4 "gdk-pixbuf" "XBM" "LGPL"
"image/x-xbitmap" ""
"xbm" ""
"#define " "" 100
"/*" "" 50
"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-xpm.dll"
"xpm" 4 "gdk-pixbuf" "XPM" "LGPL"
"image/x-xpixmap" ""
"xpm" ""
"/* XPM */" "" 100

Some files were not shown because too many files have changed in this diff Show More