diff --git a/gtk-nsis-pack/bin/fc-cache.exe b/gtk-nsis-pack/bin/fc-cache.exe index 67e2a6e3..df360438 100644 Binary files a/gtk-nsis-pack/bin/fc-cache.exe and b/gtk-nsis-pack/bin/fc-cache.exe differ diff --git a/gtk-nsis-pack/bin/fc-cat.exe b/gtk-nsis-pack/bin/fc-cat.exe index f542c41d..a9e434d3 100644 Binary files a/gtk-nsis-pack/bin/fc-cat.exe and b/gtk-nsis-pack/bin/fc-cat.exe differ diff --git a/gtk-nsis-pack/bin/fc-list.exe b/gtk-nsis-pack/bin/fc-list.exe index 4b220925..017432d0 100644 Binary files a/gtk-nsis-pack/bin/fc-list.exe and b/gtk-nsis-pack/bin/fc-list.exe differ diff --git a/gtk-nsis-pack/bin/fc-match.exe b/gtk-nsis-pack/bin/fc-match.exe index 94209937..2cd922cb 100644 Binary files a/gtk-nsis-pack/bin/fc-match.exe and b/gtk-nsis-pack/bin/fc-match.exe differ diff --git a/gtk-nsis-pack/bin/fc-pattern.exe b/gtk-nsis-pack/bin/fc-pattern.exe index ba714a58..ce19351d 100644 Binary files a/gtk-nsis-pack/bin/fc-pattern.exe and b/gtk-nsis-pack/bin/fc-pattern.exe differ diff --git a/gtk-nsis-pack/bin/fc-query.exe b/gtk-nsis-pack/bin/fc-query.exe index cb21fe98..743cd098 100644 Binary files a/gtk-nsis-pack/bin/fc-query.exe and b/gtk-nsis-pack/bin/fc-query.exe differ diff --git a/gtk-nsis-pack/bin/fc-scan.exe b/gtk-nsis-pack/bin/fc-scan.exe index 42ab30cd..8001dec6 100644 Binary files a/gtk-nsis-pack/bin/fc-scan.exe and b/gtk-nsis-pack/bin/fc-scan.exe differ diff --git a/gtk-nsis-pack/bin/fc-validate.exe b/gtk-nsis-pack/bin/fc-validate.exe index 19969f84..1de96c5f 100644 Binary files a/gtk-nsis-pack/bin/fc-validate.exe and b/gtk-nsis-pack/bin/fc-validate.exe differ diff --git a/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe b/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe index 6e8c7fdc..9d5d424a 100644 Binary files a/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe and b/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe differ diff --git a/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe b/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe index 466f67b8..370b3c12 100644 Binary files a/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe and b/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe differ diff --git a/gtk-nsis-pack/bin/gspawn-win64-helper.exe b/gtk-nsis-pack/bin/gspawn-win64-helper.exe index d000ab2e..d1dd0be9 100644 Binary files a/gtk-nsis-pack/bin/gspawn-win64-helper.exe and b/gtk-nsis-pack/bin/gspawn-win64-helper.exe differ diff --git a/gtk-nsis-pack/bin/gtk-builder-convert b/gtk-nsis-pack/bin/gtk-builder-convert deleted file mode 100644 index ea737de1..00000000 --- a/gtk-nsis-pack/bin/gtk-builder-convert +++ /dev/null @@ -1,799 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2006-2008 Async Open Source -# Henrique Romano -# Johan Dahlin -# -# 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 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 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(""): - 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)) diff --git a/gtk-nsis-pack/bin/gtk-demo.exe b/gtk-nsis-pack/bin/gtk-demo.exe deleted file mode 100644 index ff70430e..00000000 Binary files a/gtk-nsis-pack/bin/gtk-demo.exe and /dev/null differ diff --git a/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe b/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe index a690fdd9..90aae80c 100644 Binary files a/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe and b/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe differ diff --git a/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe b/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe index 5298287b..ae7ab7b6 100644 Binary files a/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe and b/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe differ diff --git a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe b/gtk-nsis-pack/bin/gtk-update-icon-cache.exe index 72f43153..b5e418a1 100644 Binary files a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe and b/gtk-nsis-pack/bin/gtk-update-icon-cache.exe differ diff --git a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe.manifest b/gtk-nsis-pack/bin/gtk-update-icon-cache.exe.manifest deleted file mode 100644 index 61d5f98c..00000000 --- a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe.manifest +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/gtk-nsis-pack/bin/iconv.dll b/gtk-nsis-pack/bin/iconv.dll deleted file mode 100644 index 6472e6a7..00000000 Binary files a/gtk-nsis-pack/bin/iconv.dll and /dev/null differ diff --git a/gtk-nsis-pack/bin/libasprintf-0.dll b/gtk-nsis-pack/bin/libasprintf-0.dll deleted file mode 100644 index 718a8105..00000000 Binary files a/gtk-nsis-pack/bin/libasprintf-0.dll and /dev/null differ diff --git a/gtk-nsis-pack/bin/libatk-1.0-0.dll b/gtk-nsis-pack/bin/libatk-1.0-0.dll index 67926840..49f86939 100644 Binary files a/gtk-nsis-pack/bin/libatk-1.0-0.dll and b/gtk-nsis-pack/bin/libatk-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libatkmm-1.6-1.dll b/gtk-nsis-pack/bin/libatkmm-1.6-1.dll index eb591099..248bf5c6 100644 Binary files a/gtk-nsis-pack/bin/libatkmm-1.6-1.dll and b/gtk-nsis-pack/bin/libatkmm-1.6-1.dll differ diff --git a/gtk-nsis-pack/bin/libcairo-2.dll b/gtk-nsis-pack/bin/libcairo-2.dll index 7b0dd988..a80c4f69 100644 Binary files a/gtk-nsis-pack/bin/libcairo-2.dll and b/gtk-nsis-pack/bin/libcairo-2.dll differ diff --git a/gtk-nsis-pack/bin/libcairo-gobject-2.dll b/gtk-nsis-pack/bin/libcairo-gobject-2.dll index 5aa2ccf5..8a30d71d 100644 Binary files a/gtk-nsis-pack/bin/libcairo-gobject-2.dll and b/gtk-nsis-pack/bin/libcairo-gobject-2.dll differ diff --git a/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll b/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll index df53420d..afc30f7b 100644 Binary files a/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll and b/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll differ diff --git a/gtk-nsis-pack/bin/libcairomm-1.0-1.dll b/gtk-nsis-pack/bin/libcairomm-1.0-1.dll index 5a279285..711bd13c 100644 Binary files a/gtk-nsis-pack/bin/libcairomm-1.0-1.dll and b/gtk-nsis-pack/bin/libcairomm-1.0-1.dll differ diff --git a/gtk-nsis-pack/bin/libexpat-1.dll b/gtk-nsis-pack/bin/libexpat-1.dll index a57a78ea..bd0a0e8d 100644 Binary files a/gtk-nsis-pack/bin/libexpat-1.dll and b/gtk-nsis-pack/bin/libexpat-1.dll differ diff --git a/gtk-nsis-pack/bin/libexslt-0.dll b/gtk-nsis-pack/bin/libexslt-0.dll index 139bd906..434917b1 100644 Binary files a/gtk-nsis-pack/bin/libexslt-0.dll and b/gtk-nsis-pack/bin/libexslt-0.dll differ diff --git a/gtk-nsis-pack/bin/libfontconfig-1.dll b/gtk-nsis-pack/bin/libfontconfig-1.dll index 85126d55..8a77f1f6 100644 Binary files a/gtk-nsis-pack/bin/libfontconfig-1.dll and b/gtk-nsis-pack/bin/libfontconfig-1.dll differ diff --git a/gtk-nsis-pack/bin/libfreetype-6.dll b/gtk-nsis-pack/bin/libfreetype-6.dll index 88fd451e..07412aab 100644 Binary files a/gtk-nsis-pack/bin/libfreetype-6.dll and b/gtk-nsis-pack/bin/libfreetype-6.dll differ diff --git a/gtk-nsis-pack/bin/libgailutil-18.dll b/gtk-nsis-pack/bin/libgailutil-18.dll index 976ab954..91f18194 100644 Binary files a/gtk-nsis-pack/bin/libgailutil-18.dll and b/gtk-nsis-pack/bin/libgailutil-18.dll differ diff --git a/gtk-nsis-pack/bin/libgailutil-3-0.dll b/gtk-nsis-pack/bin/libgailutil-3-0.dll index 4210c991..eb458b3b 100644 Binary files a/gtk-nsis-pack/bin/libgailutil-3-0.dll and b/gtk-nsis-pack/bin/libgailutil-3-0.dll differ diff --git a/gtk-nsis-pack/bin/libgcc_s_seh-1.dll b/gtk-nsis-pack/bin/libgcc_s_seh-1.dll index 800d1736..57745c03 100644 Binary files a/gtk-nsis-pack/bin/libgcc_s_seh-1.dll and b/gtk-nsis-pack/bin/libgcc_s_seh-1.dll differ diff --git a/gtk-nsis-pack/bin/libgcc_s_seh_64-1.dll b/gtk-nsis-pack/bin/libgcc_s_seh_64-1.dll deleted file mode 100644 index fc01c90e..00000000 Binary files a/gtk-nsis-pack/bin/libgcc_s_seh_64-1.dll and /dev/null differ diff --git a/gtk-nsis-pack/bin/libgdk-3-0.dll b/gtk-nsis-pack/bin/libgdk-3-0.dll index 93b6621d..07f86326 100644 Binary files a/gtk-nsis-pack/bin/libgdk-3-0.dll and b/gtk-nsis-pack/bin/libgdk-3-0.dll differ diff --git a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll index 2256f33d..cadd6359 100644 Binary files a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll index 0f26ce02..a4a1bad3 100644 Binary files a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll b/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll index 4637a27f..59400d28 100644 Binary files a/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll and b/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll b/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll index a6cd1fb8..b2a90155 100644 Binary files a/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll and b/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll differ diff --git a/gtk-nsis-pack/bin/libgio-2.0-0.dll b/gtk-nsis-pack/bin/libgio-2.0-0.dll index c2484249..1b47e50b 100644 Binary files a/gtk-nsis-pack/bin/libgio-2.0-0.dll and b/gtk-nsis-pack/bin/libgio-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgiomm-2.4-1.dll b/gtk-nsis-pack/bin/libgiomm-2.4-1.dll index bb5be081..41b8671d 100644 Binary files a/gtk-nsis-pack/bin/libgiomm-2.4-1.dll and b/gtk-nsis-pack/bin/libgiomm-2.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libglib-2.0-0.dll b/gtk-nsis-pack/bin/libglib-2.0-0.dll index bc0dacba..22757deb 100644 Binary files a/gtk-nsis-pack/bin/libglib-2.0-0.dll and b/gtk-nsis-pack/bin/libglib-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libglibmm-2.4-1.dll b/gtk-nsis-pack/bin/libglibmm-2.4-1.dll index fe40aae1..63a330e9 100644 Binary files a/gtk-nsis-pack/bin/libglibmm-2.4-1.dll and b/gtk-nsis-pack/bin/libglibmm-2.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll b/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll index 45c717df..10fe12a8 100644 Binary files a/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll and b/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libgmodule-2.0-0.dll b/gtk-nsis-pack/bin/libgmodule-2.0-0.dll index 2a36833f..f6ca73d9 100644 Binary files a/gtk-nsis-pack/bin/libgmodule-2.0-0.dll and b/gtk-nsis-pack/bin/libgmodule-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgobject-2.0-0.dll b/gtk-nsis-pack/bin/libgobject-2.0-0.dll index 7fb7dd93..5fd8577c 100644 Binary files a/gtk-nsis-pack/bin/libgobject-2.0-0.dll and b/gtk-nsis-pack/bin/libgobject-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgraphite2.dll b/gtk-nsis-pack/bin/libgraphite2.dll index 2e5b05de..fed68046 100644 Binary files a/gtk-nsis-pack/bin/libgraphite2.dll and b/gtk-nsis-pack/bin/libgraphite2.dll differ diff --git a/gtk-nsis-pack/bin/libgthread-2.0-0.dll b/gtk-nsis-pack/bin/libgthread-2.0-0.dll index b3e722b1..c0f83056 100644 Binary files a/gtk-nsis-pack/bin/libgthread-2.0-0.dll and b/gtk-nsis-pack/bin/libgthread-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgtk-3-0.dll b/gtk-nsis-pack/bin/libgtk-3-0.dll index a1f4fcf3..8f0aaa5d 100644 Binary files a/gtk-nsis-pack/bin/libgtk-3-0.dll and b/gtk-nsis-pack/bin/libgtk-3-0.dll differ diff --git a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll index c8a88764..753dc446 100644 Binary files a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll b/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll index 1e365313..b677cabb 100644 Binary files a/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll and b/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll b/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll index 1a59d916..5d19eab3 100644 Binary files a/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll and b/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll differ diff --git a/gtk-nsis-pack/bin/libgtksourceview-2.0-0.dll b/gtk-nsis-pack/bin/libgtksourceview-2.0-0.dll index 28677f17..3f3ce23e 100644 Binary files a/gtk-nsis-pack/bin/libgtksourceview-2.0-0.dll and b/gtk-nsis-pack/bin/libgtksourceview-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgtksourceviewmm-2.0-2.dll b/gtk-nsis-pack/bin/libgtksourceviewmm-2.0-2.dll deleted file mode 100644 index 19613ac1..00000000 Binary files a/gtk-nsis-pack/bin/libgtksourceviewmm-2.0-2.dll and /dev/null differ diff --git a/gtk-nsis-pack/bin/libharfbuzz-0.dll b/gtk-nsis-pack/bin/libharfbuzz-0.dll index 180c84a6..834eda84 100644 Binary files a/gtk-nsis-pack/bin/libharfbuzz-0.dll and b/gtk-nsis-pack/bin/libharfbuzz-0.dll differ diff --git a/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll b/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll index 09ca3a30..805e2061 100644 Binary files a/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll and b/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpango-1.0-0.dll b/gtk-nsis-pack/bin/libpango-1.0-0.dll index 47ebed5f..bea04983 100644 Binary files a/gtk-nsis-pack/bin/libpango-1.0-0.dll and b/gtk-nsis-pack/bin/libpango-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll b/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll index cab5cae9..7e4e974e 100644 Binary files a/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll and b/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll b/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll index 8302fafd..851d37a3 100644 Binary files a/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll and b/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpangomm-1.4-1.dll b/gtk-nsis-pack/bin/libpangomm-1.4-1.dll index 67520180..71c0d170 100644 Binary files a/gtk-nsis-pack/bin/libpangomm-1.4-1.dll and b/gtk-nsis-pack/bin/libpangomm-1.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll b/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll index 33061934..f4f24124 100644 Binary files a/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll and b/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpixman-1-0.dll b/gtk-nsis-pack/bin/libpixman-1-0.dll index 30a96ac6..74a712c5 100644 Binary files a/gtk-nsis-pack/bin/libpixman-1-0.dll and b/gtk-nsis-pack/bin/libpixman-1-0.dll differ diff --git a/gtk-nsis-pack/bin/libpng16-16.dll b/gtk-nsis-pack/bin/libpng16-16.dll index 20ede0d8..d512d797 100644 Binary files a/gtk-nsis-pack/bin/libpng16-16.dll and b/gtk-nsis-pack/bin/libpng16-16.dll differ diff --git a/gtk-nsis-pack/bin/libsigc-2.0-0.dll b/gtk-nsis-pack/bin/libsigc-2.0-0.dll index 601d8858..cb9abbd9 100644 Binary files a/gtk-nsis-pack/bin/libsigc-2.0-0.dll and b/gtk-nsis-pack/bin/libsigc-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libstdc++-6.dll b/gtk-nsis-pack/bin/libstdc++-6.dll index 18dc6833..4bad4fba 100644 Binary files a/gtk-nsis-pack/bin/libstdc++-6.dll and b/gtk-nsis-pack/bin/libstdc++-6.dll differ diff --git a/gtk-nsis-pack/bin/libstdc++_64-6.dll b/gtk-nsis-pack/bin/libstdc++_64-6.dll deleted file mode 100644 index 03cb18af..00000000 Binary files a/gtk-nsis-pack/bin/libstdc++_64-6.dll and /dev/null differ diff --git a/gtk-nsis-pack/bin/libwinpthread-1.dll b/gtk-nsis-pack/bin/libwinpthread-1.dll index 82be745c..142f2e9a 100644 Binary files a/gtk-nsis-pack/bin/libwinpthread-1.dll and b/gtk-nsis-pack/bin/libwinpthread-1.dll differ diff --git a/gtk-nsis-pack/bin/libwinpthread_64-1.dll b/gtk-nsis-pack/bin/libwinpthread_64-1.dll deleted file mode 100644 index e40c03d0..00000000 Binary files a/gtk-nsis-pack/bin/libwinpthread_64-1.dll and /dev/null differ diff --git a/gtk-nsis-pack/bin/libxml++-2.6-2.dll b/gtk-nsis-pack/bin/libxml++-2.6-2.dll index a5d3cfa3..f7f56aaa 100644 Binary files a/gtk-nsis-pack/bin/libxml++-2.6-2.dll and b/gtk-nsis-pack/bin/libxml++-2.6-2.dll differ diff --git a/gtk-nsis-pack/bin/libxml++-3.0-1.dll b/gtk-nsis-pack/bin/libxml++-3.0-1.dll index fe77b1e7..25115b96 100644 Binary files a/gtk-nsis-pack/bin/libxml++-3.0-1.dll and b/gtk-nsis-pack/bin/libxml++-3.0-1.dll differ diff --git a/gtk-nsis-pack/bin/libxml2-2.dll b/gtk-nsis-pack/bin/libxml2-2.dll index 60f109a7..041d9a90 100644 Binary files a/gtk-nsis-pack/bin/libxml2-2.dll and b/gtk-nsis-pack/bin/libxml2-2.dll differ diff --git a/gtk-nsis-pack/bin/libxslt-1.dll b/gtk-nsis-pack/bin/libxslt-1.dll index a4fa030b..dabca50d 100644 Binary files a/gtk-nsis-pack/bin/libxslt-1.dll and b/gtk-nsis-pack/bin/libxslt-1.dll differ diff --git a/gtk-nsis-pack/bin/pango-querymodules.exe b/gtk-nsis-pack/bin/pango-querymodules.exe deleted file mode 100644 index cb973b47..00000000 Binary files a/gtk-nsis-pack/bin/pango-querymodules.exe and /dev/null differ diff --git a/gtk-nsis-pack/bin/zlib1.dll b/gtk-nsis-pack/bin/zlib1.dll index f9d79ecf..5ac41bb7 100644 Binary files a/gtk-nsis-pack/bin/zlib1.dll and b/gtk-nsis-pack/bin/zlib1.dll differ diff --git a/gtk-nsis-pack/copy-msys2-files.sh b/gtk-nsis-pack/copy-msys2-files.sh index 4769233d..01ffbf0b 100644 --- a/gtk-nsis-pack/copy-msys2-files.sh +++ b/gtk-nsis-pack/copy-msys2-files.sh @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # --------------------------------------------------------------------------- # Set default values to option vars # --------------------------------------------------------------------------- - +set -e INSTALL_SRC_DIR=$(dirname "$0") INSTALL_SRC_MSYS2="/mingw64/" _DATE=$(date +'%Y-%m-%d') @@ -44,11 +44,14 @@ 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 @@ -59,9 +62,12 @@ 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 @@ -78,8 +84,8 @@ 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/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 @@ -111,6 +117,7 @@ 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 @@ -149,4 +156,4 @@ cp -r $INSTALL_SRC_MSYS2/share/icons $INSTALL_SRC_DIR/share/ 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" \ No newline at end of file +echo "Now you can initiate the creation of the installer package with NSIS" diff --git a/gtk-nsis-pack/etc/gtk-3.0/settings.ini b/gtk-nsis-pack/etc/gtk-3.0/settings.ini index 25c66b4b..cca85468 100644 --- a/gtk-nsis-pack/etc/gtk-3.0/settings.ini +++ b/gtk-nsis-pack/etc/gtk-3.0/settings.ini @@ -1,7 +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 \ No newline at end of file +gtk-xft-rgba=rgb diff --git a/gtk-nsis-pack/gtk2-runtime.ts.nsi b/gtk-nsis-pack/gtk2-runtime.ts.nsi index 1d891868..6d6c9b0c 100644 --- a/gtk-nsis-pack/gtk2-runtime.ts.nsi +++ b/gtk-nsis-pack/gtk2-runtime.ts.nsi @@ -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}-2016-11-29-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 diff --git a/gtk-nsis-pack/gtk3-runtime.ts.nsi b/gtk-nsis-pack/gtk3-runtime.ts.nsi index 690a87ca..1768df80 100644 --- a/gtk-nsis-pack/gtk3-runtime.ts.nsi +++ b/gtk-nsis-pack/gtk3-runtime.ts.nsi @@ -11,9 +11,9 @@ ; Directory and package names: gtk3-runtime. -!define GTK_VERSION "3.20.2" +!define GTK_VERSION "3.22.4" !define GTK_BIN_VERSION "3.0.0" -!define PRODUCT_VERSION "${GTK_VERSION}-2016-09-05-ts-win64" +!define PRODUCT_VERSION "${GTK_VERSION}-2016-11-29-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" @@ -272,8 +272,8 @@ SectionIn 1 2 RO File bin\libpangomm-1.4-1.dll 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\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 @@ -350,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' @@ -635,8 +635,8 @@ Function un.DeleteDlls Delete $LIB_INSTDIR\libxslt-1.dll ; fontconfig needs this Delete $LIB_INSTDIR\libpcre-1.dll ; fontconfig needs this Delete $LIB_INSTDIR\libxml2-2.dll ; fontconfig needs this - ; Delete $LIB_INSTDIR\libxml++-2.6-2.dll ; fontconfig needs this - ; Delete $LIB_INSTDIR\libxml++-3.0-1.dll + 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\libexpat-1.dll Delete $LIB_INSTDIR\libbz2-1.dll diff --git a/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache b/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache index ee8f1b33..156b3f65 100644 --- a/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache +++ b/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache @@ -1,13 +1,100 @@ # GdkPixbuf Image Loader Modules file # Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.35.4 +# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.0 # -# LoaderDir = C:\Development\msys64\mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders +# LoaderDir = C:\msys64\mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders # -"C:/Development/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll" +"C:/msys64/mingw64/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 + +"C:/msys64/mingw64/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 + +"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.dll" +"gif" 4 "gdk-pixbuf" "GIF" "LGPL" +"image/gif" "" +"gif" "" +"GIF8" "" 100 + +"C:/msys64/mingw64/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 + +"C:/msys64/mingw64/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 + +"C:/msys64/mingw64/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 + +"C:/msys64/mingw64/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 + +"C:/msys64/mingw64/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 + +"C:/msys64/mingw64/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" "" "