pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/glade



Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Jul 20 14:40:36 UTC 2020

Modified Files:
        pkgsrc/devel/glade: Makefile PLIST distinfo
        pkgsrc/devel/glade/patches: patch-configure

Log Message:
glade: update to 3.36.0

News
====

        - widget: canonicalize support-warning property name
        - tests: Include back GtkTreeViewColumn
        - gtk+: properly cast to avoid warnings
        - gtk+: workaround truncation warning by being safer
        - gladeui: remove unused type_func variable
        - gladeui: Ensure that we write the "type-func" property when a get-type-function is defined in the
catalog
        - Allow to specify placeholder to GtkListBox
        - gtk+: Allow to use GtkResponseType with GtkDialog and GtkInfobar buttons
        - gladeui: Change the boolean parsing logic to be the same as Gtk
        - Appdata: update app-id
        - Update FSF address
        - gladeui: Modernize GladeSignalEditor codebase
        - RDNN appdata & desktop file
        - gtk+: Add homogeneous property to GtkStackSwitcher
        - gladeui: Fix wrong pointer convertion in GladeDesignView
        - gtk+: Provide Gtk 3.22 properties for GtkScrolledWindow
        - gtk+: Add missing 3.22 enum/flag values
        - gladeui: Modernize GladeWidgetAdaptor definition
        - gtk+: Keep internationalization context in Atk properties
        - gladeui: Plug tiny leak on Drag & Drop
        - gladeui: Fix crash on drag-n-drop
        - gladeui: fix several tiny memory leaks found with valgrind
        - Make it easier to track GladeXML elements and be GObject Introspection friendly by registering
boxed types
        - gladeui: Replace the last occurences of GladeWidgetClass with GladeWidgetAdaptor in the comments
        - gladeui: Use G_DECLARE_FINAL_TYPE for GladeObjectStub
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeNamedIconChooserDialog
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeInspector
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeEditorProperty
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeEditor
        - gladeui: Use G_DECLARE_INTERFACE for GladeEditable
        - gladeui: Use G_DECLARE_INTERFACE for GladeDrag
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeDesignView
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeDesignLayout
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeCommand
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeClipboard
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeCellRendererIcon
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeBaseEditor
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeApp
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeAdaptorChooserWidget
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeEditorSkeleton
        - gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeEditorTable
        - dnd: Enable Drag&Drop on wayland
        - gladeui: remove implicit cast in assignment
        - build: remove G_CONST_RETURN usage
        - gladeui: ignore various GParameter deprecations
        - Fix on debug traces after rename GladePropertyClass to GladePropertyDef
        - meson: Activate enable-debug variables
        - Prevent dragging an ancestor inside a child
        - GladePopup: Clear add item when adding as toplevel
        - GtkImage: Fix icon size being reset
        - build: Fix OSX support in meson
        - build: Do not use a system variable only for Windows
        - Fix loading dylibs on OSX
        - Set the "About Dialogue" as modal
        - Fix split sentense in GladeProject
        - Adding "Glade" to "About" section.
        - Respect the Glade namespace for macros and defines
        - Rename *Klass to *Class as there are no name collision anymore
        - Fix two memory leaks discovered with valgrind
        - GladeSignalDef: fix documentation for glade_signal_def_set_deprecated
        - Rename GWActionClass to GladeWidgetActionDef to use the right namespace
        - Rename GladePropertyClass to GladePropertyDef and declare it as boxed
        - Rename GladeSignalClass to GladeSignalDef and declare it as boxed
        - Create GladeSettings to hold the settings instead of using a Gtk widget for holding it
        - Add GDK_VERSION_MIN_REQUIRED
        - Utils: get the absolute path but avoid accessing it
        - Fix several compiler warnings
        - Replace some functions by Gtk 3.22 ones
        - GladeSignalClass: rename glade_signal_class_get_type
        - Allow to use GtkFileChooserNative
        - GladeProperty: Keep the bind-source, bind-property and bind-flags elements
        - Couple of fixes for memory leaks found with valgrind
        - GtkLinkButton: allow to edit the label
        - gladeui: Fix several memory leaks with GladeWidgetAdaptor
        - gladeui: Fix leak of create_type in GladePropertyClass
        - gladeui: fix memory leak in GWActionClass
        - introspection: Add many annotations to sources
        - No wide handles in `center_paned` and `left_paned`
        - flatpak: Set meson as buildsystem
        - build: Port to meson build system
        - gtk+: Add deprecated flag to GtkButton and GtkImage stock properties
        - doc: remove missing xml files
        - doc: Modernize the documentation
        - docs: Make some changes to fix warnings with the documentation
        - Add metadata information about releases
        - i18n: Do not use input file for not translated files
        - Fix xgettext string extraction for catalogs
        - snap: update for icon filename changes
        - Add translator comments to the .desktop file
        - gladeui-2.0.pc: Data paths relative to datadir
        - icon: update app icon
        - GladeProject: escape markup in parser errors
        - Use autoreconf instead deprecated gnome-common
        - Stop defaulting missing images to deprecated stock icons
        - Migrate from intltool to gettext
        - gladeui: Fix GIR package reference and add c-include
        - dtd: Add several new elements
        - Add initial implementation of Automatic Templates
        - GladeIntro: fix regresion in find_widget_forall()
        - GladeProject: add handler signals
        - GladeEditor: expose signal editor widget as a property
        - GladeIntro: use name and buildable name to find widgets
        - GladeWindow: simplify pointer mode actions
        - GladeWindow: move actions to GtkApplication
        - GladeEPropAttrs: use sane adjustment values for size and scale attrs
        - GtkActionable: add action-target property
        - Fix tab/space identation
        - GladeWidgetAdaptor: add glade_widget_adaptor_get_display_name()
        - GladeWindow: port to GtkApplication
        - Remove GladeInstantiable prefix from UI
        - GladeGtkBin: add initial support for GtkBin abstract class
        - GladeWidget: add support for abstract classes
        - widget-editor: Replace margin right/left for end/start
        - GladeModelButton: improve editor
        - GladeEditorProperty, GladePropertyClass, GladeWidgetAdaptor:
        - GladeModelButton: enable icon/iconic properties
        - Gtk plugin: add support for GFileIcon
        - Add initial support for GFile type properties
        - Bump Gtk required version to 3.22
        - GladeGtkBox: improve children sort function
        - GladeGtkHeaderBar: Improve position packing property handling
        - Add OARS tags
        - Gtk catalog: mark GtkImageMenuItem as deprecated since 3.10
        - GladeWidgetAdaptor: added deprecated-since metadata
        - GladeImageItemEditor: use display name for commands names
        - GladeCommand: ensure widget name on object properties
        - GladeGtkAdjustment: add digits virtual property
        - GladeEPropNumeric: bind precision property to spin button
        - GladeProperty: add precision property
        - GladePropertyClass: round floating point values to epsilon
        - ui/widget: Make template ver# warning more useful
        - GladeCommand: ignore special child types placeholders in add command. GladeGtkWindow: mark titlebar
placeholder as special child type.
        - Gtk Catalog: add back GtkStatusbar
        - GladeGtkHeaderBar: mark title and subtitle as translatable
        - GladeGtkDialog: chain up post_create() method
        - GladeGtkWindow: remove get_children() method
        - GladeAdaptorChooser: add missing translation domain
        - GladeGtkWidget: save accessible-role atk property
        - GladeGtkWindow: fix regression in csd handling


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/glade/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/glade/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/glade/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/glade/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/glade/Makefile
diff -u pkgsrc/devel/glade/Makefile:1.97 pkgsrc/devel/glade/Makefile:1.98
--- pkgsrc/devel/glade/Makefile:1.97    Tue Jun  2 08:22:35 2020
+++ pkgsrc/devel/glade/Makefile Mon Jul 20 14:40:36 2020
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2020/06/02 08:22:35 adam Exp $
+# $NetBSD: Makefile,v 1.98 2020/07/20 14:40:36 maya Exp $
 
-DISTNAME=              glade-3.22.1
-PKGREVISION=           4
+DISTNAME=              glade-3.36.0
 CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/glade/3.22/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/glade/3.36/}
 EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -19,6 +18,9 @@ GNU_CONFIGURE=                yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config intltool gmake msgfmt
 
+# Requires --xml in msgfmt.
+_TOOLS_USE_PKGSRC.msgfmt=      yes
+
 PKGCONFIG_OVERRIDE+=   data/gladeui-2.0.pc.in
 
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/devel/glade/PLIST
diff -u pkgsrc/devel/glade/PLIST:1.11 pkgsrc/devel/glade/PLIST:1.12
--- pkgsrc/devel/glade/PLIST:1.11       Sun Apr 28 07:06:06 2019
+++ pkgsrc/devel/glade/PLIST    Mon Jul 20 14:40:36 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2019/04/28 07:06:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2020/07/20 14:40:36 maya Exp $
 bin/glade
 bin/glade-previewer
 include/libgladeui-2.0/gladeui/glade-adaptor-chooser.h
@@ -23,11 +23,11 @@ include/libgladeui-2.0/gladeui/glade-nam
 include/libgladeui-2.0/gladeui/glade-palette.h
 include/libgladeui-2.0/gladeui/glade-placeholder.h
 include/libgladeui-2.0/gladeui/glade-project.h
-include/libgladeui-2.0/gladeui/glade-property-class.h
+include/libgladeui-2.0/gladeui/glade-property-def.h
 include/libgladeui-2.0/gladeui/glade-property-label.h
 include/libgladeui-2.0/gladeui/glade-property-shell.h
 include/libgladeui-2.0/gladeui/glade-property.h
-include/libgladeui-2.0/gladeui/glade-signal-class.h
+include/libgladeui-2.0/gladeui/glade-signal-def.h
 include/libgladeui-2.0/gladeui/glade-signal-editor.h
 include/libgladeui-2.0/gladeui/glade-signal-model.h
 include/libgladeui-2.0/gladeui/glade-signal.h
@@ -42,7 +42,7 @@ lib/libgladeui-2.la
 lib/pkgconfig/gladeui-2.0.pc
 man/man1/glade-previewer.1
 man/man1/glade.1
-share/applications/glade.desktop
+share/applications/org.gnome.Glade.desktop
 share/glade/catalogs/glade-catalog.dtd
 share/glade/catalogs/gtk+.xml
 share/glade/catalogs/gtkunixprint.xml
@@ -361,33 +361,47 @@ share/glade/pixmaps/plus.png
 share/gtk-doc/html/gladeui-2/GladeApp.html
 share/gtk-doc/html/gladeui-2/GladeBaseEditor.html
 share/gtk-doc/html/gladeui-2/GladeClipboard.html
+share/gtk-doc/html/gladeui-2/GladeCommand.html
 share/gtk-doc/html/gladeui-2/GladeDesignView.html
+share/gtk-doc/html/gladeui-2/GladeEditable.html
+share/gtk-doc/html/gladeui-2/GladeEditor.html
 share/gtk-doc/html/gladeui-2/GladeEditorProperty.html
 share/gtk-doc/html/gladeui-2/GladeInspector.html
 share/gtk-doc/html/gladeui-2/GladePalette.html
 share/gtk-doc/html/gladeui-2/GladePlaceholder.html
 share/gtk-doc/html/gladeui-2/GladeProject.html
 share/gtk-doc/html/gladeui-2/GladeProperty.html
+share/gtk-doc/html/gladeui-2/GladeSignal.html
+share/gtk-doc/html/gladeui-2/GladeSignalEditor.html
 share/gtk-doc/html/gladeui-2/GladeWidget.html
 share/gtk-doc/html/gladeui-2/GladeWidgetAction.html
+share/gtk-doc/html/gladeui-2/GladeWidgetAdaptor.html
+share/gtk-doc/html/gladeui-2/annotation-glossary.html
+share/gtk-doc/html/gladeui-2/api-index-full.html
 share/gtk-doc/html/gladeui-2/catalog.html
 share/gtk-doc/html/gladeui-2/catalogintro.html
 share/gtk-doc/html/gladeui-2/core.html
 share/gtk-doc/html/gladeui-2/dockables.html
 share/gtk-doc/html/gladeui-2/gladeui-2.devhelp2
 share/gtk-doc/html/gladeui-2/gladeui-Glade-Utils.html
-share/gtk-doc/html/gladeui-2/gladeui-GladeClipboardView.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeAdaptorChooser.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeCatalog.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeCellRendererIcon.html
 share/gtk-doc/html/gladeui-2/gladeui-GladeFixed.html
-share/gtk-doc/html/gladeui-2/gladeui-GladePropertyClass.html
-share/gtk-doc/html/gladeui-2/gladeui-GladeSignalEditor.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeNameContext.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeObjectStub.html
+share/gtk-doc/html/gladeui-2/gladeui-GladePreview.html
+share/gtk-doc/html/gladeui-2/gladeui-GladePreviewer.html
+share/gtk-doc/html/gladeui-2/gladeui-GladePropertyDef.html
+share/gtk-doc/html/gladeui-2/gladeui-GladePropertyLabel.html
+share/gtk-doc/html/gladeui-2/gladeui-GladePropertyShell.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeSignalDef.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeSignalModel.html
+share/gtk-doc/html/gladeui-2/gladeui-GladeWidgetActionDef.html
+share/gtk-doc/html/gladeui-2/gladeui-Initializing-the-library.html
 share/gtk-doc/html/gladeui-2/gladeui-Xml-Utils.html
-share/gtk-doc/html/gladeui-2/gladeui-glade-command.html
-share/gtk-doc/html/gladeui-2/gladeui-glade-editor.html
-share/gtk-doc/html/gladeui-2/gladeui-glade-parameter.html
-share/gtk-doc/html/gladeui-2/gladeui-glade-widget-adaptor.html
 share/gtk-doc/html/gladeui-2/home.png
 share/gtk-doc/html/gladeui-2/index.html
-share/gtk-doc/html/gladeui-2/ix01.html
 share/gtk-doc/html/gladeui-2/left-insensitive.png
 share/gtk-doc/html/gladeui-2/left.png
 share/gtk-doc/html/gladeui-2/misc.html
@@ -438,6 +452,9 @@ share/help/hi/glade/legal.xml
 share/help/hu/glade/figures/main-window.png
 share/help/hu/glade/index.docbook
 share/help/hu/glade/legal.xml
+share/help/id/glade/figures/main-window.png
+share/help/id/glade/index.docbook
+share/help/id/glade/legal.xml
 share/help/it/glade/figures/main-window.png
 share/help/it/glade/index.docbook
 share/help/it/glade/legal.xml
@@ -471,14 +488,9 @@ share/help/uk/glade/legal.xml
 share/help/zh_CN/glade/figures/main-window.png
 share/help/zh_CN/glade/index.docbook
 share/help/zh_CN/glade/legal.xml
-share/icons/hicolor/16x16/apps/glade.png
-share/icons/hicolor/22x22/apps/glade.png
-share/icons/hicolor/24x24/apps/glade.png
-share/icons/hicolor/256x256/apps/glade.png
-share/icons/hicolor/32x32/apps/glade.png
-share/icons/hicolor/48x48/apps/glade.png
-share/icons/hicolor/scalable/apps/glade-brand-symbolic.svg
-share/icons/hicolor/scalable/apps/glade-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Glade.svg
+share/icons/hicolor/symbolic/apps/glade-brand-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Glade-symbolic.svg
 share/locale/ar/LC_MESSAGES/glade.mo
 share/locale/ast/LC_MESSAGES/glade.mo
 share/locale/az/LC_MESSAGES/glade.mo
@@ -550,4 +562,4 @@ share/locale/vi/LC_MESSAGES/glade.mo
 share/locale/zh_CN/LC_MESSAGES/glade.mo
 share/locale/zh_HK/LC_MESSAGES/glade.mo
 share/locale/zh_TW/LC_MESSAGES/glade.mo
-share/metainfo/glade.appdata.xml
+share/metainfo/org.gnome.Glade.appdata.xml

Index: pkgsrc/devel/glade/distinfo
diff -u pkgsrc/devel/glade/distinfo:1.12 pkgsrc/devel/glade/distinfo:1.13
--- pkgsrc/devel/glade/distinfo:1.12    Sun Apr 28 07:06:06 2019
+++ pkgsrc/devel/glade/distinfo Mon Jul 20 14:40:36 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2019/04/28 07:06:06 wiz Exp $
+$NetBSD: distinfo,v 1.13 2020/07/20 14:40:36 maya Exp $
 
-SHA1 (glade-3.22.1.tar.xz) = 395728b7f0b4c3a0acadd7e12c39db6296761b22
-RMD160 (glade-3.22.1.tar.xz) = a9bd7695fbd85d528df5df90914956bf3f7f380e
-SHA512 (glade-3.22.1.tar.xz) = e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
-Size (glade-3.22.1.tar.xz) = 3592952 bytes
-SHA1 (patch-configure) = 2ecc6e4a846041a4e115e77ef03e798806962978
+SHA1 (glade-3.36.0.tar.xz) = 2137c0945c602a865a2910736f3ff5cd442bc8ef
+RMD160 (glade-3.36.0.tar.xz) = 577ca6641931a066fc9d5cdcc083fc78c221fabc
+SHA512 (glade-3.36.0.tar.xz) = c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
+Size (glade-3.36.0.tar.xz) = 4466808 bytes
+SHA1 (patch-configure) = 3eb71f9cc8efbc162d69b6d8aee47b10506385ee

Index: pkgsrc/devel/glade/patches/patch-configure
diff -u pkgsrc/devel/glade/patches/patch-configure:1.1 pkgsrc/devel/glade/patches/patch-configure:1.2
--- pkgsrc/devel/glade/patches/patch-configure:1.1      Sun Apr 28 07:06:49 2019
+++ pkgsrc/devel/glade/patches/patch-configure  Mon Jul 20 14:40:36 2020
@@ -1,20 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2019/04/28 07:06:49 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2020/07/20 14:40:36 maya Exp $
 
 Use portable test(1) operator.
 
---- configure.orig     2018-04-02 22:07:35.000000000 +0000
+--- configure.orig     2020-05-06 20:19:58.000000000 +0000
 +++ configure
-@@ -13210,7 +13210,8 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
- if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-       INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
- else
--      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) 
$(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
-+      PKGSRC_random=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
-+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$PKGSRC_random && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) 
$(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
- fi
-       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -14913,7 +14914,7 @@ for d in sc.get_config_var('INCLDIRSTOMA
+@@ -16861,7 +16861,7 @@ for d in sc.get_config_var('INCLDIRSTOMA
  
  print(' '.join(incldirs))
  "
@@ -23,7 +13,7 @@ Use portable test(1) operator.
    PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
  fi
  
-@@ -14946,10 +14947,10 @@ print(libs)"
+@@ -16894,10 +16894,10 @@ print(libs)"
  am_python_print_lib_loc="\
  from distutils import sysconfig as sc
  print(sc.get_config_var('LIBDIR'))"



Home | Main Index | Thread Index | Old Index