diff options
-rw-r--r-- | .gitignore | 18 | ||||
-rw-r--r-- | AUTHORS (renamed from build/AUTHORS) | 0 | ||||
-rw-r--r-- | COPYING (renamed from build/COPYING) | 0 | ||||
-rw-r--r-- | Makefile.am | 101 | ||||
-rw-r--r-- | README (renamed from build/README) | 0 | ||||
-rwxr-xr-x | autogen.sh | 23 | ||||
-rw-r--r-- | build/ChangeLog | 0 | ||||
-rw-r--r-- | build/INSTALL | 234 | ||||
-rw-r--r-- | build/MAINTAINERS | 7 | ||||
-rw-r--r-- | build/Makefile.am | 30 | ||||
-rw-r--r-- | build/NEWS | 483 | ||||
-rwxr-xr-x | build/autogen.sh | 21 | ||||
-rw-r--r-- | build/configure.ac | 32 | ||||
-rw-r--r-- | configure.ac | 80 | ||||
-rwxr-xr-x | create-icon-theme.sh | 97 | ||||
-rw-r--r-- | index.theme.in.in | 24 | ||||
-rw-r--r-- | po/POTFILES.in | 17 | ||||
-rwxr-xr-x | render-icon-theme.rb | 49 | ||||
-rw-r--r-- | src/Makefile.am | 49 |
19 files changed, 295 insertions, 970 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..5c170456b --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +Makefile +Makefile.in +Makefile.in.in +POTFILES +aclocal.m4 +autom4te.cache +configure +config.* +index.theme +install-sh +missing +stamp-it + +*.tar.bz2 +*.tar.gz +*.gmo +.intltool-merge-cache + diff --git a/build/AUTHORS b/AUTHORS index 286210595..286210595 100644 --- a/build/AUTHORS +++ b/AUTHORS diff --git a/build/COPYING b/COPYING index d60c31a97..d60c31a97 100644 --- a/build/COPYING +++ b/COPYING diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000..26fd5d8f8 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,101 @@ +DISTCHECK_CONFIGURE_FLAGS = --disable-icon-mapping + +SUBDIRS = po $(SVGSRCDIR) + +theme_in_files = index.theme.in.in +theme_DATA = $(theme_in_files:.theme.in.in=.theme) + +THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done | sed -e "s/,$$//g") + +render: Makefile + ($(am__cd) $(SVGSRCDIR) && $(MAKE) $(AM_MAKEFLAGS) render) \ + || eval `exit 1` + +%.theme.in: %.theme.in.in $(SVGOUTDIR) Makefile + dirs="`echo $(THEME_DIRS) | sed -e 's#$(srcdir)/gnome/##g'`"; \ + sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \ + for dir in `echo $$dirs | sed -e "s/,/ /g"`; do \ + sizefull="`dirname $$dir`"; \ + size="`echo $$sizefull | sed -e 's/x.*$$//g'`"; \ + context="`basename $$dir`"; \ + echo "[$$dir]" >> $@; \ + if test "$$context" = "actions"; then \ + echo "Context=Actions" >> $@; \ + fi; \ + if test "$$context" = "animations"; then \ + echo "Context=Animations" >> $@; \ + fi; \ + if test "$$context" = "apps"; then \ + echo "Context=Applications" >> $@; \ + fi; \ + if test "$$context" = "categories"; then \ + echo "Context=Categories" >> $@; \ + fi; \ + if test "$$context" = "devices"; then \ + echo "Context=Devices" >> $@; \ + fi; \ + if test "$$context" = "emblems"; then \ + echo "Context=Emblems" >> $@; \ + fi; \ + if test "$$context" = "emotes"; then \ + echo "Context=Emotes" >> $@; \ + fi; \ + if test "$$context" = "intl"; then \ + echo "Context=International" >> $@; \ + fi; \ + if test "$$context" = "mimetypes"; then \ + echo "Context=MimeTypes" >> $@; \ + fi; \ + if test "$$context" = "places"; then \ + echo "Context=Places" >> $@; \ + fi; \ + if test "$$context" = "status"; then \ + echo "Context=Status" >> $@; \ + fi; \ + echo "Size=$$size" >> $@; \ + if test "$$size" = "256"; then \ + echo "MinSize=56" >> $@; \ + echo "MaxSize=512" >> $@; \ + echo "Type=Scalable" >> $@; \ + else \ + echo "Type=Fixed" >> $@; \ + fi; \ + echo "" >> $@; \ + done + +@INTLTOOL_THEME_RULE@ + +# we don't want to install mo files, all translations are already stored +# in theme files +install-data-local: + $(MAKE) -C po uninstall + if [ -h $(DESTDIR)$(themedir) ]; then \ + rm -f $(DESTDIR)$(themedir); \ + fi + if [ -d $(DESTDIR)$(themedir) ]; then \ + touch $(DESTDIR)$(themedir); \ + fi + +EXTRA_DIST = \ + gnome \ + $(theme_in_files) + +CLEANFILES = \ + $(theme_DATA) + +MAINTAINERCLEANFILES = \ + Makefile.in \ + aclocal.m4 \ + config.guess \ + config.h.in \ + config.sub \ + configure \ + depcomp \ + install-sh \ + intltool-*.in \ + libtool \ + ltmain.sh \ + missing \ + mkinstalldirs \ + po/Makefile.in.in \ + po/$(GETTEXT_PACKAGE).pot diff --git a/autogen.sh b/autogen.sh index b264d2aca..cd7b2b4d8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,3 +1,22 @@ #!/bin/sh -./create-icon-theme.sh gnome -./output/gnome/autogen.sh $@ +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +PKG_NAME="gnome-icon-theme" +REQUIRED_AUTOMAKE_VERSION=1.9 + +(test -f $srcdir/configure.ac \ + && test -f $srcdir/index.theme.in.in \ + && test -d $srcdir/src) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 +} + +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME CVS" + exit 1 +} +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/build/ChangeLog b/build/ChangeLog deleted file mode 100644 index e69de29bb..000000000 --- a/build/ChangeLog +++ /dev/null diff --git a/build/INSTALL b/build/INSTALL deleted file mode 100644 index 5458714e1..000000000 --- a/build/INSTALL +++ /dev/null @@ -1,234 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/build/MAINTAINERS b/build/MAINTAINERS deleted file mode 100644 index 2dda0697e..000000000 --- a/build/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -Rodney Dawes -Email: dobey.pwns@gmail.com -Userid: dobey - -Jakub Steiner -Email: jimmac@ximian.com -Userid: jimmac diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index 1073ed9b8..000000000 --- a/build/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -themedir = $(datadir)/icons/THEME_NAME - -SUBDIRS = REAL_SUB_DIRS - -#THEME_IN_FILES = index.theme.in - -#%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - -theme_DATA = index.theme - -gtk_update_icon_cache = gtk-update-icon-cache -f -t "$(themedir)" - -install-data-hook: - @if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - - -EXTRA_DIST= \ - index.theme - -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \ - configure depcomp install-sh ltmain.sh \ - Makefile.in missing config.h.in - diff --git a/build/NEWS b/build/NEWS deleted file mode 100644 index fa39639dc..000000000 --- a/build/NEWS +++ /dev/null @@ -1,483 +0,0 @@ -Version 2.16.0.1 - -* Updated system-lock-screen icon to fill all sizes - -- bug #354257 (Lapo Calamandrei) -* Updated accessories-text-editor icon to fill all sizes - -- bug #354256 (Lapo Calamandrei) -* Updated 24x24 utilities-terminal icon from 22x22 icon - -- bug #354279 (Rodney Dawes) - -Version 2.16.0 - -* Add gtk-edit icon at 16x16, 22x22, and 24x24 sizes (Lapo Calamandrei) -* Install 24x24 video-display icon - -- bug #354112 (Rodney Dawes) -* Update 24x24 computer icon from updated 22x22 source - -- bug #354111 (Rodney Dawes) -* Add a new logviewer icon (Lapo Calamandrei) -* New help-browser, emblem-new, and user-desktop icons (Lapo Calamandrei) -* New text-x-generic-template icon (Andreas Nilsson) -* Add scalable and 32x32 go action icons (Andras Nilsson) -* Updated scalable and 32x32 go-home icons (Lapo Calamandrei) -* New list-add and list-remove icons - -- bug #348415 (Andreas Nilsson) -* Port some cvs emblem icons to scalable (Rodney Dawes) -* Replace emblem-package and emblem-web with new style icons (Rodney Dawes) -* Add missing 32x32 mimetypes directory to index.theme.in (Rodney Dawes) -* Updated network status icons (Lapo Calamandrei) -* New translations [mg, mr] - -Version 2.15.92 - -* Add x-office-drawing icon (Lapo Calamandrei) -* Add 32x32 mime type icons (Lapo Calamandrei) -* Update scalable mime type icon shadows (Lapo Calamandrei) -* Add application-certificate icon (Andreas Nilsson) -* More icon cleanup to remove replaced icons (Rodney Dawes) -* Add zoom-best-fit icon (Lapo Calamandrei) -* Add 32x32 and scalable folder-new icons (Lapo Calamandrei) -* Fix scalable web-browser icon not being installed - -- bug #351249 (Rodney Dawes) -* 32x32 versions of zoom icons (Lapo Calamandrei) -* Updated style weather status icons (Lapo Calamandrei) -* 32x32 and scalable applications-development icons (Andreas Nilsson) -* Updated translations [de] - -Version 2.15.91 - -* Add applications-accessories scalable icon (Andreas Nilsson, Jakub Steiner) -* Add new preferences-system icon (Andreas Nilsson, Jakub Steiner) -* Add new network-workgroup icon (Andreas Nilsson, Jakub Steiner) -* Add missing size icons, and fixes (Lapo Calamandrei, Jakub Steiner) -* Add new start-here icon (Lapo Calamandrei, Jakub Steiner) -* Add new media-flash icon (Rodney Dawes, Jakub Steiner) -* New generic multimedia-player icon (Andreas Nilsson, Jakub Steiner) -* Add new network-server icon (Andreas Nilsson, Jakub Steiner) -* Add new applications-games icon (Andreas Nilsson, Jakub Steiner) -* Rename {drive,media}-cdrom to {drive,media}-optical (Rodney Dawes) -* Add properly sized process-{idle,working} animation icons - -- bug #349353 (Jakub Steiner) -* Add missing directories to index.theme.in - -- bug #349353 (Rodney Dawes) -* Add missing tab-new in 16x16/actions/Makefile.am - -- bug #348981 (Rodney Dawes) -* Add new view-fullscreen and view-restore icons (Jakub Steiner) -* New and updated translations [bn_IN, fr, mk, ml, or] - -Version 2.15.90 - -* Moved stock_* fullscreen icons to view-* action names (Rodney Dawes) -* Removed stock_close icons - -- bug #348509 (Rodney Dawes) -* Removed stock_open icons - -- bug #348401 (Rodney Dawes) -* Add document-new icons and update new "emblem" on *-new icons - -- bug #348433 (Jakub Steiner) -* New utilities-terminal icons (Andreas Nilsson) -* Fix missing computer.svg in scalable/devices/Makefile.am (Rodney Dawes) -* New system-run icons (Lapo Calamendrei) -* New preferences-desktop-screensaver and system-file-manager (Andreas Nilsson) -* 32x32 version of spinner images (Jakub Steiner) -* Removed some old icons replaced with newer versions already (Rodney Dawes) -* Scalable versions of the appointment-* status icons - (Rodney Dawes, Jakub Steiner) - -Version 2.15.3 - -* Various build related bug fixes - -- bugs #347083 #346870 #346306 #346580 (Rodney Dawes, Jakub Steiner) -* More removal and renaming of icons - -- bugs #346621 #347023 (Rodney Dawes) -* 8x8 version of the symlink emblem icon - -- bugs #311279 #310402 (Rodney Dawes) -* Add folder-remote.icon for scalable to match emblems of folder.icon - -- bug #309113 (Rodney Dawes) -* New symbolic link icon - -- bug #310402 (Jakub Steiner) -* New utilities-system-monitor icon - -- bug #306537 (Rodney Dawes, Lapo Calemendrei) -* New dialog-warning, dialog-error, dialog-information icons (Jakub Steiner) -* New appointment status icons (Jakub Steiner) -* Scalable version of applications-internet - -- bug #164068 (Rodney Dawes) -* New emblem-important, emblem-favorite icons (Jakub Steiner) -* New preferences-desktop-wallpaper icon - -- bug #313643 (Andreas Nilsson, Rodney Dawes, Jakub Steiner) -* Removed xchat icon - -- bug #153078 (Rodney Dawes) -* New audio-volume status icons at bitmap sizes (Jakub Steiner) -* use proper coordinates for SVG for text-x-preview.icon - -- bug #329877 (Rodney Dawes) -* New and updated translations [bn_IN, zh_HK, zh_TW] - -Version 2.15.2 - -* Use of po/LINGUAS and requirement of intltool 0.35.0 (Rodney Dawes) -* Scalable zoom icons (Lapo Calamendre, Jakub Steiner) -* Updated translations [lv] - -Version 2.15.1 - -* New printer device and print action icons (Lapo Calamendrei) -* New find/replace action icons (Lapo Calamendrei) -* Scalable delete/save action icons (Lapo Calamendrei) -* New dictionary icon (Ulisse Perusin) -* Remove obsolete no_NO locale (Kjartan Maraas) -* Style updates for many icons (Jakub Steiner, Rodney Dawes, Lapo Calamendrei) -* Remove unmaintained and distro-specific spec file (Rodney Dawes) -* Added MAINTAINERS file (Rodney Dawes) -* New and updated translations [be, ca, dz, et, ka] - -Changes since 2.13.7 - -* Add in spinner animations to replace gnome-spinner images - (Jakub Steiner, Rodney Dawes) -* Update scalable folders to match the pixmaps better (Jakub Steiner) - -Changes since 2.13.6 - -* Require icon-naming-utils 0.6.7 for updates (Rodney Dawes) -* Replace gnome-fs-regular with text-x-preview (Rodney Dawes) -* Remove the old gnome-mime-application-x-gnome-saved-search icons that were - replaced with the folder-saved-search icon (Rodney Dawes) -* Update 24x24 icons to match the new 22x22 icons (Rodney Dawes) -* Remove 48x48/mimetypes as they are replaced by scalable versions - (Rodney Dawes) -* Updated style for icons (Jakub Steiner) -* Fix typographical error in index.theme.in (Luca Ferretti) -* Renamed volume-knob to multimedia-volume-control to match naming spec - (Rodney Dawes) -* Match color in 16px computer screen with larger versions - -- bug #165860 (Rodney Dawes) - -Changes since 2.13.5.1 - -* Update a few icons to use hints from Tango Style Guidelines (Jakub Steiner) -* Fix some icons being installed to wrong size locations (Rodney Dawes) - -Changes since 2.13.5 - -* Initial major cleanup and porting to Icon Naming Spec - -- bugs #317460, #318505, #163693, #303601, #112909, #169745 (Rodney Dawes) -* Replace the stock person icon with an abstract person icon - -- bug #311844 (Jakub Steiner) -* No longer install icons to hicolor to prevent conflicts (Rodney Dawes) - (This change requires gtk+ 2.8.10 or newer for themes that do not explicitly - have a fallback hierarchy which includes "gnome" for several applications) - -Changes since 2.13.4 - -* Do not use Scalable as the type for bitmap icons (Rodney Dawes) -* New saved search icon (Jakub Steiner) -* New translations [te] - -Changes since 2.13.2 - -* Removed specific video mime type icons (Rodney Dawes) -* Fixups for generic image mime type icon (Jakub Steiner) - -Changes since 2.13.0 - -* Removed specific image mime type icons (Rodney Dawes) -* Added ruby mime type icon - -- bug #317102 -* Updated translations [sk] - -Changes since 2.12.1 - -* Improve architecture independence - -- bug #316200 (Stanislav Brabec) -* Fix permissions of some installed png files to not be executable - -- bug #316173 (Stanislav Brabec) -* Fix installation of media and emoticons to use gnome instead of hicolor - -- http://bugzilla.novell.com/show_bug.cgi?id=91387 (Rodney Dawes) -* Change the volume-knob icon in all sizes, and replace 48x48 with svg - -- bug #408160 (Jakub Steiner) -* Updated translations [bg, bn, eu] - -Changes since 2.11.92 - -* Create icondir before installing into it and no / between destdir and icondir - (Tor Lillqvist) -* Install scalable application icons to hicolor - (Jakub Steiner) -* Make 48x48 filesystem icons be scalable again - -- bug #314346 (Jakub Steiner) -* Updated translations [cy, ru] - -Changes since 2.11.91 - -* Add a generic image-viewer icon - -- bug #167087 (Jakub Steiner) -* Make 48x48 icons scalable so huge icons don't show up in menus - -- bug #313052 (Jakub Steiner) -* Remove Adobe logo from postscript-viewer icon - -- bug #313390 (Jakub Steiner) -* Remove Blender logo icons due to trademark issue (Jakub Steiner) -* Updated translations [id] - -Changes since 2.11.90 - -* Remove icons or parts of icons as appropriate to remove trademarks - (Rodney Dawes) -* Remove KDE app info icons as the mime type is no longer used - (Rodney Dawes) -* Remove seagulls from OpenDocument mime type icons - -- bug #303599 (Jakub Steiner, Rodney Dawes) -* Add a DnD directory accept icon for 16px size - -- bug #306188 (Jakub Steiner) -* Remove 192px sized cdrom icon - -- bug #312099 (Jakub Steiner) -* Remove Firefox logo icon at 24px size - -- bug #312839 (Jakub Steiner) -* Updated translations [sr, sr@Latn, zh_TW] - -Changes since 2.11.5 - -* Install image files required by symlinks so cp does not break on win32 - (Rodney Dawes) - -Changes since 2.11.4 - -* Add -f argument to $LN_S variable - -- bug #309635 (Rodney Dawes) -* Require automake 1.9 and use tar-ustar (Shaun McCance, Rodney Dawes) - -Changes since 2.10.1 - -* More icons merged in from GPerfection theme (Jakub Steiner) -* More conversion of emblems to SVG (Jakub Steiner) -* New icon for Evolution (Jakub Steiner) -* Support for Win32 (Tor Lillqvist, Rodney Dawes) -* New stock_database icon at 16 and 24 px sizes - -- bug #132769 (Jakub Steiner) -* Fix python mime type icon - -- bug #167182 (Jakub Steiner) -* New and updated translations [gl, fa, rw, th, vi, xh, zh_TW] - -Changes since 2.10.0 - -* New OpenOffice.org MIME type icons - -- bug #167296 (Jakub Steiner) -* Renamed gnome-fs-{locally-shared,share-private} to stock_shared-{by,to}-me - (Jakub Steiner) -* Updated translations [en_CA] - -Changes since 2.9.92 - -* Updated translations [hu, pl, ro, sr, sr@Latn, zh_TW] - -Changes since 2.9.91 - -* Scalable mail emblem (Jakub Steiner, Andreas Nilsson) -* Text Editor icon (Jakub Steiner) -* 16 pixel versions of 1394 and usb device icons - -- bug #166193 (Jakub Steiner) -* 16 pixel versions of gnome-fs-{ftp,nfs,smb,ssh} icons - -- bug #166192 (Jakub Steiner) -* Consistent wallpaper color for all gnome-fs-client icons - -- bug #165860 (Jakub Steiner) -* Replaced larger gnome-fs-{directory,home} icons with SVG (Jakub Steiner) -* Updated translations [bg, ca, da, el, en_GB, et, fr, gu, ko, nl, sq, sv, ko] - -Changes since 2.9.90 - -* Scalable trash icons (Jakub Steiner) -* gnome-window-manager.png - -- bug #144880 (Luca Ferretti) -* 16, 24, and 48 pixel versions of gnome panel action icons - -- bug #166156 (Jakub Steiner) -* Use a scalable icon for the favorite emblem (Jakub Steiner) -* 16 and 24 pixel versions of the home icon - -- bug #164502 (Jakub Steiner) -* Updated translations [cs, de, en_CA, es, fi, it, ja, lt, nb, no, pt] - -Changes since 2.9.3 - -* 16 and 24 pixel local and and network share icons (Jakub Steiner) -* New trash icons for empty and full states - -- bug #163848 (Jakub Steiner) -* 16 and 24 pixel stock_leave-fullscreen icons - -- bug #164017 (Jakub Steiner) - -Changes since 2.9.2 - -* 16 and 24 pixel volume setting icons (Jakub Steiner) -* 48 pixel version of stock_insert-floating-frame (Garrett LeSage) - -Changes since 2.9.1 - -* Clear and Partly Cloudy icons for night time in gweather -* Stock icon for "New Window" -* Lower resolution gnome-fs-desktop icons (Luca Ferretti, Garrett LeSage) -* Scalable gnome-fs-{home,directory} icons (Luca Ferretti) -* Genercize the cd burner icon -* Print resolution stock icon -* Update program launcher icon for GNOME 2 style -* Coaster project file mime type icons, Fixes #157864 -* Openoffice.org mime type icons -* 48 pixel version of stock_mail-replied -* Updated translations [bg] - -Changes since 2.9.0 - -* New 72 and 96 pixel versions of home folder icon (Luca Ferretti) -* New launcher-program icon -* New dev-disc icons for HAL, fixes #156066 -* New application/x-x509-ca-cert icon, fixes #153245 -* New palm applet icon, Fixes #155567 -* New icon for application/x-dv -* Clean up of configure.in and autogen.sh, Fixes #154668 -* New translations [gl] - -Changes since 2.8.0 - -* New emblem icon for sharing folders -* New icons for different panel applets -* Updated translations [sk] - -Changes since 2.7.90 - -* New mime icon for WordPerfect documents -* New 16x16 and 24x24 stock_new-tab icons -* Updated translations [cy, th, zh_TW] - -Changes since 1.3.7 - -* New translations [bs, nb] -* Updated translations [az, ca, es, eu, fi, ne, sq, sv, uk] - -Changes since 1.3.6 - -* New device icons -* Updated translations [fi, fr, ms, sr, zh_CN] - -Changes since 1.3.5 - -* Add open lock icons, Fixes #141458 -* Add bittorrent icon, Fixes #148226 -* Add ipod icons -* Add 32 and 48 px icons for mail-send-receive -* Updated translations [bg, da, hi, hu, ko, pt_BR, sq] - -Changes since 1.3.4 - -* Updated translations [sq, da, bg, pt_BR] - -Changes since 1.3.3: - -* Added stock_3dsound and stock_headphones icons for 24 and 16 pixel sizes -* Added text/x-objcsrc mime type icon, Fixes #144987 - -Changes since 1.3.2: - -* Fix API breakage for stock_save_as vs. stock_save-as -* Fix build so that make distcheck works - -Changes since 1.2.1: - -* new smiley icons -* new stock icons -* Bugs Fixed: #142977, #142001, #138612 - -Changes since 1.2.0: -* new im icons -* some mime icon updates -* Some new evolution icons - -Changes since 1.1.91: -* duplex and tumble icon for printing - -Changes since 1.1.90: -* More translations - -Changes since 1.1.8: -* indent icon polish -* renamed csharp mime icon due to changed mimetype - -Changes since 1.1.7: -* New gnome-fs-directory-visiting icon -* more small size stock icons - -Changes since 1.1.6: -* new stock icons -* make install DESTDIR fix - -Changes since 1.1.5: -* new stock icons - -Changes since 1.1.4: -* searchtool icons -* more evo icons -* new visiting icon -* test for hicolor installed at build time - -Changes since 1.1.3: -* Lots of new icons -* pkg-config file - -Changes since 1.1.2: -* more icons needed for evo - -Changes since 1.1.1: -* web calendar icon -* vcard mimetype icon - -Changes since 1.1.0: -* Media icons in menu size -* New emblems -* Flags -* removable device icons -* other icons - -Changes since 1.0.9 -* Lots of new icons. - -Changes since 1.0.8 -* more evo icons - -Changes since 1.0.7 -* Updated translations -* New icons: todo, cell-phone, addressbook, - appointment-reminder - -Changes since 1.0.6 -* Remove adobe logo -* new stock mail open icon -* build fixes - -Changes since 1.0.5: -* Lots of new icons from jimmac - -Changes since 1.0.4: -* Moved some icons from gnome-desktop - -Changes since 1.0.3: -* Added gnome-spinner - -Changes since 1.0.2: -* desktop emblem -* notification area icon -* gnucash mime icon -* tar mime icon -* ipod firmware mime icon - -Changes since 1.0.1: - -* Added a notes emblem - -Version 1.0.1 - -Changes since 1.0.0: - -* shockwave flash icon - -* OOo draw icon - -* scheme icon - -* translations - -1.0.0: - -This is the inital stable release of the gnome icon theme. diff --git a/build/autogen.sh b/build/autogen.sh deleted file mode 100755 index 32351d7f8..000000000 --- a/build/autogen.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="gnome-icon-theme" -REQUIRED_AUTOMAKE_VERSION=1.9 - -gettext=`which gettext` -gettext_prefix=`dirname $gettext | xargs dirname` - -if [ -x $gettext_prefix/share/gettext/mkinstalldirs ]; then - cp $gettext_prefix/share/gettext/mkinstalldirs $srcdir -fi - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/build/configure.ac b/build/configure.ac deleted file mode 100644 index d1e45600b..000000000 --- a/build/configure.ac +++ /dev/null @@ -1,32 +0,0 @@ -AC_PREREQ(2.53) - -AC_INIT([gnome-icon-theme], [1.0alpha1]) -AC_CONFIG_SRCDIR([16x16]) - -AM_INIT_AUTOMAKE([1.9 tar-ustar]) - -# Define the toplevel path here -AC_SUBST(themedir, "\${datadir}/icons/") - -UTILS_REQUIRED=0.8.7 - -AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) -PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, - have_utils=yes, have_utils=no) -if test "x$have_utils" = "xyes"; then - UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" - ICONMAP="$UTILS_PATH/icon-name-mapping" - AC_SUBST(ICONMAP) - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build - and install sato-icon-theme]) -fi - - -AC_CONFIG_FILES([ -MAKEFILES -]) - -AC_OUTPUT diff --git a/configure.ac b/configure.ac new file mode 100644 index 000000000..9839c3db1 --- /dev/null +++ b/configure.ac @@ -0,0 +1,80 @@ +dnl Process this file with autoconf to produce a configure script. +AC_PREREQ(2.53) + +AC_INIT([gnome-icon-theme], [2.29.0], + [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme]) +AC_CONFIG_SRCDIR([index.theme.in.in]) + +AM_INIT_AUTOMAKE([1.9 tar-ustar foreign]) + +PKG_PROG_PKG_CONFIG([0.19]) +IT_PROG_INTLTOOL([0.40.0]) + +GETTEXT_PACKAGE="${PACKAGE}" +AC_SUBST(GETTEXT_PACKAGE) +localedir='$(prefix)/$(DATADIRNAME)/locale' +AC_SUBST(localedir) + +# Workaround to make aclocal get the right flags +AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") + +# Define the toplevel path here +AC_SUBST(themedir, "\${datadir}/icons/gnome") + +# Input and Output dirs for the rendering +AC_SUBST(SVGSRCDIR, "src") +AC_SUBST(SVGOUTDIR, "gnome") + +# Icon sizes we want to install +AC_SUBST([render_sizes], ["8x8 16x16 22x22 32x32 48x48 256x256"]) + +# Allow icon mapping to be disabled +AC_ARG_ENABLE([icon-mapping], + AC_HELP_STRING([--enable-icon-mapping], + [Enable compatibility symlinks [default=auto]]), + [enable_mapping=$enableval], + [enable_mapping=yes]) + +ICONMAP="true" +if test "x$enable_mapping" != "xno"; then + UTILS_REQUIRED=0.8.7 + + AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) + PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, + have_utils=yes, have_utils=no) + if test "x$have_utils" = "xyes"; then + UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" + ICONMAP="$UTILS_PATH/icon-name-mapping" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build + and install gnome-icon-theme]) + fi +fi +AC_SUBST(ICONMAP) + +# need git, icontool, and inkscape for rendering +allow_rendering=yes +AC_PATH_PROG([GIT], [git], [false]) +if test "x$GIT" = "xfalse"; then + allow_rendering=no +fi +AC_PATH_PROG([ICONTOOL_RENDER], [icontool-render], [false]) +if test "x$ICONTOOL_RENDER" = "xfalse"; then + allow_rendering=no +fi +AC_PATH_PROG([INKSCAPE], [inkscape], [false]) +if test "x$INKSCAPE" = "xfalse"; then + allow_rendering=no +fi +AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes") + + +AC_CONFIG_FILES([ +Makefile +po/Makefile.in +src/Makefile +]) + +AC_OUTPUT diff --git a/create-icon-theme.sh b/create-icon-theme.sh deleted file mode 100755 index 286faae51..000000000 --- a/create-icon-theme.sh +++ /dev/null @@ -1,97 +0,0 @@ -#! /bin/bash - -if [ "x$1" = "x" ] -then - echo "Usage: $0 [icon theme directory]" - exit 1 -fi - -THEME_NAME=`echo "$1" | sed -e 's,/$,,'` -THEME_COMMENT="$THEME_NAME Icon Theme" - -OUTPUT=$(echo "output/$1" | sed 's/ //') -OUTPUT=`pwd`/$OUTPUT - -rm -rf "$OUTPUT" - -mkdir -p "$OUTPUT" - -CWD=`pwd` -cd "$1" -cp -r * $OUTPUT -cd $CWD - - -echo "Creating icon theme in '$OUTPUT'" - -echo "Copying build files.." - -cp build/* "$OUTPUT" - -cd "$OUTPUT" - -echo "Creating index.theme" - -echo -e "[Icon Theme]\nName=$THEME_NAME\nComment=$THEME_COMMENT\nInherits=Tango\nExample=start-here\n" > index.theme -echo -n "Directories=" >> index.theme - -DIRS=`find * -type d | grep -v git | grep -v scalable | grep "/" | sort -r` - -for foo in $DIRS -do - echo -n "$foo," >> index.theme -done - -for foo in $DIRS -do - size=`echo $foo | sed 's/\x.*//'` - if test "$size" = "256"; then - type="Scalable" - minsize="MinSize=49" - maxsize="MaxSize=512" - else - type="Fixed" - maxsize="" - minsize="" - fi - context=`basename $foo | sed 's/^[a-z]/\U&/g'` - if test "$context" = "Apps"; then - context="Applications" - fi - echo -en "\n\n[$foo]\nSize=$size\nContext=$context\nType=$type\n$minsize\n$maxsize" >> index.theme -done - - -echo "Creating Makefiles" - -SIZES=$(find * -maxdepth 0 -type d -not -name 'scalable' -printf '%f ') - -MAKEFILES='Makefile\n' -for dir in $SIZES -do - subdirs=$(find $dir/* -maxdepth 0 -type d -printf '%f ') - echo "SUBDIRS=$subdirs" > $dir/Makefile.am - MAKEFILES="$MAKEFILES\n$dir/Makefile" - for context in $subdirs - do - - MAKEFILES="$MAKEFILES\n$dir/$context/Makefile" - files=`echo $dir/$context/*.{svg,icon,png}|sed "s/$dir\/$context\///g"| sed 's/\*\.\(icon\|png\|svg\)//g'` - echo "themedir = \$(datadir)/icons/$THEME_NAME/$dir/$context" > $dir/$context/Makefile.am - echo "theme_DATA = $files" >> $dir/$context/Makefile.am - echo "EXTRA_DIST = \$(theme_DATA)" >> $dir/$context/Makefile.am - echo "install-data-local: install-themeDATA" >> $dir/$context/Makefile.am - echo " (cd \"\$(DESTDIR)\$(themedir)\" && \$(ICONMAP) -c $context )" >> $dir/$context/Makefile.am - echo "MAINTAINERCLEANFILES = Makefile.in" >> $dir/$context/Makefile.am - done -done - -echo "Updating configure.ac" -M=`echo "$MAKEFILES" | sed 's/\//\\\\\//g'` -sed -i -e "s/MAKEFILES/$M/" configure.ac - -echo "Updating Makefile.am" -sed -i -e "s/REAL_SUB_DIRS/$SIZES/" Makefile.am -sed -i -e "s/THEME_NAME/$THEME_NAME/" Makefile.am - -echo "Done" diff --git a/index.theme.in.in b/index.theme.in.in new file mode 100644 index 000000000..892f06dfe --- /dev/null +++ b/index.theme.in.in @@ -0,0 +1,24 @@ +[Icon Theme] +_Name=GNOME +_Comment=Default GNOME Theme +Example=start-here + +# KDE Specific Stuff +DisplayDepth=32 +LinkOverlay=link_overlay +LockOverlay=lock_overlay +ZipOverlay=zip_overlay +DesktopDefault=48 +DesktopSizes=16,22,32,48,64,72,96,128 +ToolbarDefault=22 +ToolbarSizes=16,22,32,48 +MainToolbarDefault=22 +MainToolbarSizes=16,22,32,48 +SmallDefault=16 +SmallSizes=16 +PanelDefault=32 +PanelSizes=16,22,32,48,64,72,96,128 + +# Directory list +Directories=@THEME_DIRS@ + diff --git a/po/POTFILES.in b/po/POTFILES.in index ad4b7e570..44c5fa24e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,17 +1,4 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -[type: gettext/ini] index.theme.in -[type: gettext/ini] scalable/emblems/emblem-desktop.icon.in -[type: gettext/ini] scalable/emblems/emblem-documents.icon.in -[type: gettext/ini] scalable/emblems/emblem-downloads.icon.in -[type: gettext/ini] scalable/emblems/emblem-favorite.icon.in -[type: gettext/ini] scalable/emblems/emblem-generic.icon.in -[type: gettext/ini] scalable/emblems/emblem-important.icon.in -[type: gettext/ini] scalable/emblems/emblem-mail.icon.in -[type: gettext/ini] scalable/emblems/emblem-new.icon.in -[type: gettext/ini] scalable/emblems/emblem-package.icon.in -[type: gettext/ini] scalable/emblems/emblem-photos.icon.in -[type: gettext/ini] scalable/emblems/emblem-readonly.icon.in -[type: gettext/ini] scalable/emblems/emblem-unreadable.icon.in -[type: gettext/ini] scalable/emblems/emblem-urgent.icon.in -[type: gettext/ini] scalable/emblems/emblem-web.icon.in +[type: gettext/ini] index.theme.in.in + diff --git a/render-icon-theme.rb b/render-icon-theme.rb deleted file mode 100755 index 4a79e49e3..000000000 --- a/render-icon-theme.rb +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env ruby - -require "rexml/document" -require "ftools" -include REXML -INKSCAPE = '/usr/bin/inkscape' -SRC = "./src" - -def renderit(file,explicit) - svg = Document.new(File.new("#{SRC}/#{file}", 'r')) - #puts "DEBUG: #{file}" - svg.root.each_element("//g[contains(@inkscape:label,'baseplate')]") do |icon| - if icon.attributes['inkscape:groupmode']=='layer' #only look inside layers, there may be pasted groups - context = icon.elements["text[@inkscape:label='context']/tspan"].nil? ? 'blank' : icon.elements["text[@inkscape:label='context']/tspan"].text - icon_name = icon.elements["text[@inkscape:label='icon-name']/tspan"].nil? ? 'blank' : icon.elements["text[@inkscape:label='icon-name']/tspan"].text - puts "#{file}:#{icon.attributes['inkscape:label']} #{context}/#{icon_name}" - icon.each_element("rect") do |box| - dir = "gnome/#{box.attributes['width']}x#{box.attributes['height']}/#{context}" - out = "#{dir}/#{icon_name.gsub(/$/,'.png')}" - cmd = "#{INKSCAPE} -i #{box.attributes['id']} -e #{out} #{SRC}/#{file} > /dev/null 2>&1" - File.makedirs(dir) unless File.exists?(dir) - if (!explicit && File.exists?(out)) - print "-" #skip if PNG exists - else - system(cmd) - print "." - end - end - puts '' - end - end -end - -if (ARGV[0].nil?) #render all SVGs - system("mkdir gnome/") - puts "Rendering from SVGs in #{SRC}" - Dir.foreach(SRC) do |file| - renderit(file, false) if file.match(/svg$/) - end - puts "\nrendered all SVGs" -else #only render the SVG passed - file = "#{ARGV[0]}.svg" - if (File.exists?("#{SRC}/#{file}")) - renderit(file, true) - puts "\nrendered #{file}" - else - puts "[E] No such file (#{file})" - end -end diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 000000000..2dd57499e --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,49 @@ + +icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg"`; do printf "$$i "; done) +icon_files = $(shell for i in `find $(top_builddir)/$(SVGOUTDIR) -name "*.png"`; do printf "$$i"; done) + +if ALLOW_RENDERING +render-png: $(icon_in_files) Makefile + for file in $(icon_in_files); do \ + for size in $(render_sizes); do \ + $(ICONTOOL_RENDER) -s $$size -o $(top_builddir)/$(SVGOUTDIR) $$file >/dev/null; \ + done; \ + done + +else +render-png: $(icon_in_files) Makefile + cp -a $(top_srcdir)/$(SVGOUTDIR) $(top_builddir)/$(SVGOUTDIR) + +endif + +$(render_sizes): Makefile + +render: render-png + +install-data-local: + for size in $(render_sizes); do \ + for dir in `if [ -d $(top_srcdir)/$(SVGOUTDIR)/$$size ]; then find $(top_srcdir)/$(SVGOUTDIR)/$$size/* -type d; fi`; do \ + for file in $(icon_files); do \ + context="`dirname $$file`"; \ + $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ + done; \ + done; \ + done + +uninstall-local: + for size in $(render_sizes); do \ + for dir in `if [ -d $(top_srcdir)/$(SVGOUTDIR)/$$size ]; then find $(top_srcdir)/$(SVGOUTDIR)/$$size/* -type d; fi`; do \ + for file in $(icon_files); do \ + rm -f $(DESTDIR)$(themedir)/$$size/$$file; \ + done; \ + done; \ + done + +EXTRA_DIST = \ + $(icon_in_files) + + +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(icon_cache) |