Commit 6481767a authored by Bastien Nocera's avatar Bastien Nocera
Browse files

2007-08-28 Bastien Nocera <hadess@hadess.net>

	* configure.ac: Check for xmllint

	* Makefile.am: run test-mime-data from xdgmime if we're running in CVS
	and have xdgmime checked out and built in the parent
	* tests/*: add loads of test data and a test list from Matthias Clasen
	<mclasen@redhat.com> (Closes: #5210)

	* freedesktop.org.xml.in:
	- Remove "Microsoft Word 6.0 Document" matchlet at offset 2080, it's a
	localised string (ie. says "Dokument" in German, etc.)
	- Add better matchlets from file(1) for word documents
	- Add magic for StarWriter (tentative) and for glade files
	- Up the priority of the EPS matchlet so that EPS files are not
	recognised as postscript files
parent c3d8b8b2
2007-08-28 Bastien Nocera <hadess@hadess.net>
* configure.ac: Check for xmllint
* Makefile.am: run test-mime-data from xdgmime if we're running in CVS
and have xdgmime checked out and built in the parent
* tests/*: add loads of test data and a test list from Matthias Clasen
<mclasen@redhat.com> (Closes: #5210)
* freedesktop.org.xml.in:
- Remove "Microsoft Word 6.0 Document" matchlet at offset 2080, it's a
localised string (ie. says "Dokument" in German, etc.)
- Add better matchlets from file(1) for word documents
- Add magic for StarWriter (tentative) and for glade files
- Up the priority of the EPS matchlet so that EPS files are not
recognised as postscript files
2007-08-12 Bastien Nocera <hadess@hadess.net>
* freedesktop.org.xml.in: add a mime-type for QTIF QuickTime image
......
......@@ -57,7 +57,14 @@ uninstall-hook:
all: check
check:
if [ -d CVS/ ]; then \
if test -n $(XMLLINT) ; then \
xmllint --noout --valid $(srcdir)/freedesktop.org.xml; \
fi
if test -d CVS/ && test -x ../xdgmime/src/test-mime-data ; then \
mkdir -p $(builddir)/temp-mime-dir/mime/packages ; \
cp -a $(builddir)/freedesktop.org.xml $(builddir)/temp-mime-dir/mime/packages/ ; \
XDG_DATA_DIRS="$(builddir)/temp-mime-dir/" $(builddir)/update-mime-database "$(builddir)/temp-mime-dir/mime/" ; \
XDG_DATA_DIRS="$(builddir)/temp-mime-dir/" ../xdgmime/src/test-mime-data -v tests/list; \
rm -rf "$(builddir)/temp-mime-dir/" ; \
fi
......@@ -38,7 +38,9 @@ AC_ARG_ENABLE(update-mimedb,
AC_HELP_STRING([--disable-update-mimedb],
[disable the update-mime-database after install [default=no]]),,
enable_update_mimedb=yes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
AC_PATH_PROG([XMLLINT],[xmllint])
AC_CONFIG_FILES([
Makefile
......
......@@ -400,7 +400,8 @@ command to generate the output files.
<match type="string" value="PO^Q`" offset="0"/>
<match type="string" value="\376\067\0\043" offset="0"/>
<match type="string" value="\333\245-\0\0\0" offset="0"/>
<match type="string" value="Microsoft Word 6.0 Document" offset="2080"/>
<match type="string" value="MSWordDoc" offset="2112"/>
<match type="string" value="MSWordDoc" offset="2108"/>
<match type="string" value="Microsoft Word document data" offset="2112"/>
</magic>
<glob pattern="*.doc"/>
......@@ -448,6 +449,9 @@ command to generate the output files.
<glob pattern="*.sdw"/>
<glob pattern="*.vor"/>
<glob pattern="*.sgl"/>
<magic priority="90">
<match type="string" value="StarWriter" offset="2089" />
</magic>
</mime-type>
<mime-type type="application/vnd.sun.xml.calc">
<sub-class-of type="application/zip"/>
......@@ -1303,6 +1307,9 @@ command to generate the output files.
<sub-class-of type="application/xml"/>
<_comment>Glade project</_comment>
<glob pattern="*.glade"/>
<magic priority="50">
<match type="string" value="&lt;glade-interface" offset="0:256"/>
</magic>
</mime-type>
<mime-type type="application/x-gmc-link">
<_comment>GMC link</_comment>
......@@ -2937,7 +2944,7 @@ command to generate the output files.
<_comment>EPS image</_comment>
<acronym>EPS</acronym>
<expanded-acronym>Encapsulated PostScript</expanded-acronym>
<magic priority="50">
<magic priority="90">
<match type="string" value="%!" offset="0">
<match type="string" value="EPS" offset="15"/>
</match>
......
From mclasen@redhat.com Mon Oct 17 00:13:50 2005
Subject: more FT_INTERNAL removal
From: Matthias Clasen <mclasen@redhat.com>
To: freetype-devel@nongnu.org
Content-Type: text/plain
Message-Id: <1129522427.2503.4.camel@c-24-218-204-47.hsd1.ma.comcast.net>
Mime-Version: 1.0
X-Mailer: Evolution 2.4.0 (2.4.0-2)
Date: Mon, 17 Oct 2005 00:13:50 -0400
X-Evolution-Format: text/plain
X-Evolution-Account: 1096119554.21784.0@x1-6-00-50-fc-70-9f-e0
X-Evolution-Transport: smtp://mclasen@localhost:2226/;use_ssl=when-possible
X-Evolution-Fcc: email://local@local/Sent
Content-Transfer-Encoding: 8bit
I have written a patch to make fontconfig no longer use FT_INTERNAL
headers, by copying the ftglue code found in Pango. The patch is at
https://bugs.freedesktop.org/show_bug.cgi?id=4779
Matthias
# image formats supported by the Gimp
test.bmp image/bmp
test.cel image/x-cel xxx
test.dcm application/dicom
test.eps image/x-eps
test.fit image/x-fits x
test.fli video/x-flic ox
test.gif image/gif
test.ico image/x-ico ox
test.im1 image/x-sun-raster x
test.jpg image/jpeg
test.mng video/x-mng ox
test.pat image/x-pat xxx
test.pcx image/x-pcx x
test.pgm image/x-portable-graymap
test.pix image/x-pix xxx
test.png image/png
test.ppm image/x-portable-pixmap
test.ps application/postscript
test.psd image/x-psd
test.sgi image/x-sgi ox
test.tga image/x-tga ox
test.tif image/tiff
test.xbm image/x-xbitmap ox
test.xcf image/x-xcf ox
test.xpm image/x-xpixmap
test.xwd image/x-xwindowdump ox
# document formats supported by Openoffice.org
ooo-6.0.doc application/msword
ooo-95.doc application/msword
ooo.doc application/msword
ooo.rtf application/rtf
ooo.sdw application/vnd.stardivision.writer
ooo.stw application/vnd.sun.xml.writer.template ox
ooo.sxw application/vnd.sun.xml.writer
ooo.vor application/vnd.stardivision.writer
ooo-xp.doc application/msword
# text
text-iso8859-15.txt text/plain ox
text-utf8.txt text/plain ox
# other
text.pdf application/pdf
project.glade application/x-glade
text.ps application/postscript
File added
{\rtf1\ansi\deff0\adeflang1025
{\fonttbl{\f0\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New Roman};}{\f1\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New Roman};}{\f2\fmodern\fprq1\fcharset0 Nimbus Mono L{\*\falt Courier New};}{\f3\fnil\fprq2\fcharset0 Nimbus Sans L{\*\falt Arial};}{\f4\fnil\fprq2\fcharset0 Tahoma{\*\falt Lucidasans};}{\f5\fnil\fprq0\fcharset0 Tahoma{\*\falt Lucidasans};}}
{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
{\stylesheet{\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af4\afs24\lang255\ltrch\dbch\af3\afs24\langfe255\loch\f0\fs24\lang1033\snext1 Default;}
{\s2\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af4\afs24\lang255\ltrch\dbch\af3\afs24\langfe255\loch\f0\fs24\lang1033\sbasedon1\snext2 Text body;}
{\s3\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af5\afs24\lang255\ltrch\dbch\af3\afs24\langfe255\loch\f0\fs24\lang1033\sbasedon2\snext3 List;}
{\s4\sb120\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af5\afs20\lang255\ai\ltrch\dbch\af3\afs20\langfe255\ai\loch\f0\fs20\lang1033\i\sbasedon1\snext4 Caption;}
{\s5\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af5\afs24\lang255\ltrch\dbch\af3\afs24\langfe255\loch\f0\fs24\lang1033\sbasedon1\snext5 Index;}
{\s6\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af2\afs20\lang255\ltrch\dbch\af2\afs20\langfe255\loch\f2\fs20\lang1033\sbasedon1\snext6 Preformatted Text;}
}
{\info{\creatim\yr2005\mo10\dy20\hr0\min35}{\revtim\yr2005\mo10\dy20\hr0\min37}{\printim\yr1601\mo1\dy1\hr0\min0}{\comment StarWriter}{\vern6450}}\deftab709
{\*\pgdsctbl
{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\pgdscnxt0 Default;}}
\paperh15840\paperw12240\margl1800\margr1800\margt1440\margb1440\sectd\sbknone\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
\pard\plain \ltrpar\s6\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af2\afs20\lang255\ltrch\dbch\af2\afs20\langfe255\loch\f2\fs20\lang1033 {\loch\f2\fs20\lang1033\i0\b0 some text in a certain encoding 1234567890.}
\par {\loch\f2\fs20\lang1033\i0\b0 some more text with non-ASCII: \'f6\'e4\'fc\'d6\'c4\'dc}
\par }
\ No newline at end of file
File added
File added
File added
File added
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
</glade-interface>
File added
File added
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment