diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-12-23 04:07:44 +0300 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-12-23 04:07:44 +0300 |
| commit | e5d1253d363a209ecd1288278808e38ac87b34d9 (patch) | |
| tree | 72b1b57e66468e122f5d2a4f3b56abe7a7ccca94 | |
| parent | 2a23325617c01f170bdacb25f2777aa9f4f6ef14 (diff) | |
| download | sciteco-e5d1253d363a209ecd1288278808e38ac87b34d9.tar.gz | |
Curses: don't install PNG icons
* They are used at runtime only by the GTK port.
* Their existence can cause problems if OS-specific build systems
have to clean these files from the staging directory afterwards.
This was the case on FreeBSD where the committer refused to remove
these files after installation.
In the official FreeBSD port, we therefore currently ship the
PNG icons unnecessarily.
* They are now installed and shipped only on GTK builds.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | freebsd/pkg-plist | 6 |
4 files changed, 7 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 3375ce8..c9ba183 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,11 +11,13 @@ dist_scitecodata_DATA = sample.teco_ini EXTRA_DIST = README TODO +if INTERFACE_GTK # Only the lower resolution PNG icons are installed as they are # required by the GTK UI. -# Other uses are left to the distro package manager. +# Other icons might be required for OS/distro-specific packaging. dist_scitecodata_DATA += ico/sciteco-16.png ico/sciteco-32.png \ ico/sciteco-48.png +endif EXTRA_DIST += ico/sciteco-256.png ico/sciteco.ico EXTRA_DIST += win32/loaders.cache @@ -100,7 +100,7 @@ Features across all supported platforms. Gtk+ builds allow further customization using CSS. The user interface is kept minimalistic and is consistent in spirit across the different platforms. -* Syntax highlighting, styles, line numbers, etc. thanks to Scintilla. +* Syntax highlighting, styles, line numbers, etc. thanks to Scintilla, Lexilla and Scintillua. Low-level Scintilla commands can also be accessed to extend SciTECO. SciTECO even syntax highlights code, written in the SciTECO language itself. * A growing standard library of macros with frameworks for color schemes, syntax highlighting @@ -590,11 +590,6 @@ Features: * Instead of defaulting to nothing in the absence of ~/.teco_ini, we should load the installed sample.teco_ini, which gives a more user-friendly experience. - * Don't automatically install the icons unless on GTK. - If necessary, they can be extracted from the source tree by - the OS-specific build system and installed as application icons. - The DATADIR/*.png icons are only always required on Gtk. - See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276492#c19 * NLS (Native Language Support). I could at least add German and Russian. There aren't many localizable strings in SciTECO. Should be optional. diff --git a/freebsd/pkg-plist b/freebsd/pkg-plist index a4b0058..c129643 100644 --- a/freebsd/pkg-plist +++ b/freebsd/pkg-plist @@ -11,9 +11,6 @@ share/man/man7/%%PROGRAM_PREFIX%%sciteco.7.gz %%DATADIR%%/lib/fnkeys.tes %%DATADIR%%/lib/getopt.tes %%DATADIR%%/lib/lexer.tes -%%DATADIR%%/sciteco-16.png -%%DATADIR%%/sciteco-32.png -%%DATADIR%%/sciteco-48.png %%LEXILLA%%%%DATADIR%%/lib/lexers/abaqus.tes %%LEXILLA%%%%DATADIR%%/lib/lexers/ada.tes %%LEXILLA%%%%DATADIR%%/lib/lexers/asciidoc.tes @@ -106,6 +103,9 @@ share/man/man7/%%PROGRAM_PREFIX%%sciteco.7.gz %%DATADIR%%/lib/women/tedoc.tes.1.woman.tec %%DATADIR%%/sample.teco_ini %%DATADIR%%/sciteco.tmac +%%GTK%%%%DATADIR%%/sciteco-16.png +%%GTK%%%%DATADIR%%/sciteco-32.png +%%GTK%%%%DATADIR%%/sciteco-48.png %%GTK%%%%DATADIR%%/fallback.css %%GTK%%share/icons/hicolor/16x16/apps/sciteco.png %%GTK%%share/icons/hicolor/32x32/apps/sciteco.png |