diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:02:13 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:23:00 -0600 |
| commit | e485e0ffb51ed11325a31fe77e84252be6c9fad9 (patch) | |
| tree | 99bdf428a7bcea9f59ab5b4bd00afffa6806a788 /external/jpeg/patches | |
| parent | 5285beeaa49f6678b471d472868c305c7d9da5f9 (diff) | |
fdo#70393: move jpeg to a subdir of external
Change-Id: I56be33efe0cc1deaf7a7e7ce6c6ea292dbe7786d
Reviewed-on: https://gerrit.libreoffice.org/6543
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/jpeg/patches')
| -rw-r--r-- | external/jpeg/patches/jpeg-8c-jmorecfg.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/external/jpeg/patches/jpeg-8c-jmorecfg.patch b/external/jpeg/patches/jpeg-8c-jmorecfg.patch new file mode 100644 index 000000000000..34437440220f --- /dev/null +++ b/external/jpeg/patches/jpeg-8c-jmorecfg.patch @@ -0,0 +1,29 @@ +--- misc/jpeg-8c/jmorecfg.h 2009-11-20 09:01:24.000000000 +0100 ++++ misc/build/jpeg-8c/jmorecfg.h 2011-03-24 21:29:02.073761750 +0100 +@@ -21,7 +21,7 @@ + * We do not support run-time selection of data precision, sorry. + */ + +-#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ ++#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ + + + /* +@@ -158,7 +158,8 @@ + + /* INT32 must hold at least signed 32-bit values. */ + +-#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ ++#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ ++#ifndef _SOLAR_H + #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ + #ifndef _BASETSD_H /* MinGW is slightly different */ + #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ +@@ -166,6 +167,7 @@ + #endif + #endif + #endif ++#endif + #endif + + /* Datatype used for image dimensions. The JPEG standard only supports |