From: jk7744.park Date: Sat, 24 Oct 2015 08:23:27 +0000 (+0900) Subject: tizen 2.4 release X-Git-Tag: accepted/tizen/2.4/mobile/20151029.030013^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=refs%2Ftags%2Ftizen_2.4_mobile_release;p=framework%2Fuifw%2Fxorg%2Flib%2Flibxres.git tizen 2.4 release --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ac31cd5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,78 @@ +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) +aclocal.m4 +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in +config.log +config-ml.in +config.py +config.status +config.status.lineno +config.sub +configure +configure.scan +depcomp +.deps/ +INSTALL +install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh +missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute +*~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for libXRes +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 5832f59..0000000 --- a/ChangeLog +++ /dev/null @@ -1,579 +0,0 @@ -commit e6e0e02e4bf764fa58798540793bdeb44a60cc7f -Author: Alan Coopersmith -Date: Wed Mar 7 20:53:56 2012 -0800 - - libXres 1.0.6 - - Signed-off-by: Alan Coopersmith - -commit 96c59e1c7c61d7e42b8da5ddbe9af1a12567fd47 -Author: Alan Coopersmith -Date: Thu Nov 10 21:40:51 2011 -0800 - - Fix gcc -Wwrite-strings warning - - Signed-off-by: Alan Coopersmith - -commit fb6002c5736eda80a8ae1df46626862ca53a1c25 -Author: Alan Coopersmith -Date: Fri Sep 16 22:52:12 2011 -0700 - - Strip trailing whitespace - - Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' - git diff -w & git diff -b show no diffs from this change - - Signed-off-by: Alan Coopersmith - -commit 455c02ee9143b2bfbfd99b6481a1b22a0ce2a2bf -Author: Gaetan Nadon -Date: Wed Feb 2 11:43:40 2011 -0500 - - config: comment, minor upgrade, quote and layout configure.ac - - Group statements per section as per Autoconf standard layout - Quote statements where appropriate. - Autoconf recommends not using dnl instead of # for comments - - Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. - Add AC_CONFIG_SRCDIR([Makefile.am]) - - This helps automated maintenance and release activities. - Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines - -commit ecb0cb424a93e7de7671353d9514a8bf193ad678 -Author: Gaetan Nadon -Date: Fri Jan 28 19:41:37 2011 -0500 - - config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS - - Signed-off-by: Gaetan Nadon - -commit 34e906a430185bd4debc00606321980ac25737db -Author: Gaetan Nadon -Date: Fri Jan 28 16:34:14 2011 -0500 - - config: remove unrequired AC_CONFIG_AUX_DIR - - The default location for the generation of configuation files is the current - package root directory. These files are config.* and friends. - - Signed-off-by: Gaetan Nadon - -commit 2f16931c01e667a24210b3a76c50c5d5fe46e314 -Author: Gaetan Nadon -Date: Thu Jan 27 18:50:15 2011 -0500 - - config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 - - XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls - AC_PROG_C_C99. This sets gcc with -std=gnu99. - If AC_PROG_CC macro is called afterwards, it resets CC to gcc. - - Signed-off-by: Gaetan Nadon - -commit 1cb91aaf819ae3c9385c130e4fa0146057c4c89b -Author: Alan Coopersmith -Date: Thu Oct 28 16:21:39 2010 -0700 - - libXres 1.0.5 - - Signed-off-by: Alan Coopersmith - -commit 564236eb299eb9224f4f09c7bda5bebc987c8af9 -Author: Alan Coopersmith -Date: Thu Oct 28 16:19:46 2010 -0700 - - Sun's copyrights now belong to Oracle - - Signed-off-by: Alan Coopersmith - -commit f00517c478c6e34afd7d1e1477554156d36baf0e -Author: Jesse Adkins -Date: Tue Sep 28 13:30:02 2010 -0700 - - Purge cvs tags. - - Signed-off-by: Jesse Adkins - Signed-off-by: Alan Coopersmith - -commit c8bbca66bc1cf75ca01c66901605549dc780def6 -Author: Gaetan Nadon -Date: Tue Aug 17 08:39:22 2010 -0400 - - man: store shadow man pages in git rather than generating them - - Simplify the build process and the makefile. - - Local fix in CVS for bug 5628 is not required - as the problem has been fixed in - util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba - - Signed-off-by: Gaetan Nadon - -commit b4975daf8c85eda619da1cb6f1584876786feaaa -Author: Alan Coopersmith -Date: Thu Jul 8 14:55:32 2010 -0700 - - config: upgrade to util-macros 1.8 for additional man page support - - Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS - The value of MAN_SUBST is the same for all X.Org packages. - - Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS - Use platform appropriate version of sed. - - Signed-off-by: Alan Coopersmith - -commit d2a60612f4a9f50830d3c62780fe74507a8c82ad -Author: Fernando Carrijo -Date: Thu Jul 1 07:03:29 2010 -0300 - - Purge macros NEED_EVENTS and NEED_REPLIES - - Signed-off-by: Fernando Carrijo - Acked-by: Tiago Vignatti - Reviewed-by: Alan Coopersmith - -commit f0c0c4e6d50c65b7da6f72404796c25f860a3198 -Author: Gaetan Nadon -Date: Mon Mar 29 16:50:33 2010 -0400 - - config: update AC_PREREQ statement to 2.60 - - Unrelated to the previous patches, the new value simply reflects - the reality that the minimum level for autoconf to configure - all x.org modules is 2.60 dated June 2006. - - ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz - - Signed-off-by: Gaetan Nadon - -commit eca8fc252af729453a2db8218fcfe3a686ba3df5 -Author: Gaetan Nadon -Date: Mon Mar 29 14:53:48 2010 -0400 - - config: remove the pkgconfig pc.in file from EXTRA_DIST - - Automake always includes it in the tarball. - - Signed-off-by: Gaetan Nadon - -commit ceaddfbd0f55c4863bed9c42fcce1fad0348ad19 -Author: Gaetan Nadon -Date: Tue Feb 16 10:37:21 2010 -0500 - - config: move CWARNFLAGS from configure.ac to Makefile.am - - Compiler warning flags should be explicitly set in the makefile - rather than being merged with other packages compiler flags. - - Signed-off-by: Gaetan Nadon - -commit 17eeac2a9218f5d22c71d18eee9ec1fe64bdbf5a -Author: Alan Coopersmith -Date: Thu Jan 14 21:12:39 2010 -0800 - - Update Sun license notices to current X.Org standard form - - Signed-off-by: Alan Coopersmith - -commit 79251c2f41643ba06d0fd706ea4116f7924ddefa -Author: Gaetan Nadon -Date: Fri Nov 27 20:56:03 2009 -0500 - - Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES - - Now that the INSTALL file is generated. - Allows running make maintainer-clean. - -commit 1f393e74c3dd55c3422804cac98716f1e7e35d85 -Author: Gaetan Nadon -Date: Wed Oct 28 15:08:51 2009 -0400 - - configure.ac: AM_MAINTAINER_MODE missing #24238 - - This turns off maintainer mode build rules in tarballs. - Works in conjunction with autogen.sh --enable-maintainer-mode - For all X.Org components. - -commit c4f650e235c4cb286377792b836a551e9b63a0e5 -Author: Gaetan Nadon -Date: Wed Oct 28 14:09:10 2009 -0400 - - INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 - - Add missing INSTALL file. Use standard GNU file on building tarball - README may have been updated - Remove AUTHORS file as it is empty and no content available yet. - Remove NEWS file as it is empty and no content available yet. - -commit a8ab75d941ebf3fe83832c990dd7e5f75dc0971b -Author: Gaetan Nadon -Date: Mon Oct 26 22:08:42 2009 -0400 - - Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 - - ChangeLog filename is known to Automake and requires no further - coding in the makefile. - -commit 24890a580d43d2224f6f7074c1e3cb2072536d81 -Author: Gaetan Nadon -Date: Thu Oct 22 12:34:19 2009 -0400 - - .gitignore: use common defaults with custom section # 24239 - - Using common defaults will reduce errors and maintenance. - Only the very small or inexistent custom section need periodic maintenance - when the structure of the component changes. Do not edit defaults. - -commit c34ef112fa1b20ee65a6b287759e899bca2c5823 -Author: Jeremy Huddleston -Date: Wed Oct 21 12:47:23 2009 -0700 - - This is not a GNU project, so declare it foreign. - - On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: - > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: - > > I noticed an INSTALL file in xlsclients and libXvMC today, and it - > > was quite annoying to work around since 'autoreconf -fvi' replaces - > > it and git wants to commit it. Should these files even be in git? - > > Can I nuke them for the betterment of humanity and since they get - > > created by autoreconf anyways? - > - > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 - - As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with - AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation - of the INSTALL file. It is also part of the 24206 solution. - - Signed-off-by: Jeremy Huddleston - -commit 08032a51fccda19ad4722015f4cc0b1a587592f7 -Author: Alan Coopersmith -Date: Fri Oct 9 07:54:44 2009 -0700 - - libXres 1.0.4 - - Signed-off-by: Alan Coopersmith - -commit 619eec21134a0ca9a8adb92383a05deea05b768d -Author: Alan Coopersmith -Date: Thu Oct 8 23:48:41 2009 -0700 - - XRes.man: Fix typo, improve wording, drop RCS tags - - Signed-off-by: Alan Coopersmith - -commit e854448a9bfcdfdeb6262b89a93bcbe8bcd7545c -Author: Alan Coopersmith -Date: Thu Oct 8 23:39:04 2009 -0700 - - Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS - - Signed-off-by: Alan Coopersmith - -commit 1805655654217830ae943806e6a7d653cdc48047 -Author: Alan Coopersmith -Date: Mon Feb 2 20:34:31 2009 -0800 - - Add README with pointers to mailing list, bugzilla & git repos - - Signed-off-by: Alan Coopersmith - -commit 13ee4d00a06421dfb5ee613cbd99a3111135c379 -Author: Paulo Cesar Pereira de Andrade -Date: Fri Jan 30 16:56:38 2009 -0200 - - Janitor: Correct make distcheck and remove extra .gitignore files. - -commit 168153d1e7d196ca46c5b2e286fcf7e7793f2804 -Author: Peter Hutterer -Date: Mon May 19 17:53:23 2008 +0930 - - Rename parameters to clarify QueryVersion/QueryExtension. - - These parameters are not treated as input. Rename them to make the inner - workings slightly more obvious. - - X.Org Bug 14511 - -commit 5d2e4b05ff988a0f941aa78e62857791ae2d56aa -Author: Matthieu Herrb -Date: Sun Mar 9 00:19:31 2008 +0100 - - nuke RCS Ids - -commit a4323e1bb491cbfc5b5090311cc16c805b9dd7d6 -Author: James Cloos -Date: Thu Dec 6 15:51:14 2007 -0500 - - Add missing PHONY line for automatic ChangeLog generation - -commit 04381b5f703975ffa6514d474f5fe31bc76540c4 -Author: James Cloos -Date: Mon Sep 3 05:53:33 2007 -0400 - - Add *~ to .gitignore to skip patch/emacs droppings - -commit 322797ec5679919b8616c17c51492b2d596efecb -Author: Daniel Stone -Date: Sat Dec 16 01:29:45 2006 +0200 - - bump to 1.0.3 - -commit 6a2f43119d483c1ad47b99ddec61bebcb218b534 -Author: Daniel Stone -Date: Wed Dec 6 18:58:35 2006 +0200 - - Makefile.am: make ChangeLog hook as safe as possible - -commit ec347de8a81e7af3a9b9155a9dbf703294cdfc77 -Author: Adam Jackson -Date: Fri Oct 13 16:28:28 2006 -0400 - - Bump to 1.0.2 - -commit a5608546e433a829a0d17e2b60ac196e044dde94 -Author: Adam Jackson -Date: Thu Oct 12 20:14:37 2006 -0400 - - Fix the ChangeLog hook to distcheck. - -commit ed20661748b0070771116861972f5d1f00b45ed1 -Author: Matthieu Herrb -Date: Sat Jul 29 20:23:07 2006 +0200 - - Remove ChangeLog, add a rule to generate it with git-log. - -commit 5faf9733ca4b632ec9a3640b00186b48052b3c03 -Author: Federico G. Schwindt -Date: Sat Jul 29 20:12:01 2006 +0200 - - Typo in path to XRes.h - -commit cf9bc567fbbafc57348abb7e398729d40f566e3d -Author: Alan Coopersmith -Date: Thu Jul 13 14:58:46 2006 -0700 - - renamed: .cvsignore -> .gitignore - -commit 405d6e8e7e9918a86a40e78a2baf7a1f20b86d6d -Author: Adam Jackson -Date: Thu Apr 27 00:22:20 2006 +0000 - - Bump to 1.0.1 - -commit f49ba1035cf9e8f7cc8a9c44162e5a95d692d446 -Author: Adam Jackson -Date: Mon Apr 3 19:26:13 2006 +0000 - - Bug #6407: Cygwin build fix. (Yaakov Selkowitz) - -commit d7d53b5a5b6efc54b405006103fce1721853aa02 -Author: Alan Coopersmith -Date: Sun Feb 12 18:19:20 2006 +0000 - - Bug #5628 Shadow pages - not created correctly when MANDIR & MANSUFFIX don't match. - -commit 4cfcdcae80e4e54c40cafcde1f7d341c0a9eccf5 -Author: Kevin E Martin -Date: Thu Dec 15 00:24:28 2005 +0000 - - Update package version number for final X11R7 release candidate. - -commit d65c058cb0e8cc6f1bc657a5afbf728b446c0c77 -Author: Kevin E Martin -Date: Tue Dec 6 22:48:42 2005 +0000 - - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -commit 9e37dcb3199b4c0013dcf1acc95bf9f194622e83 -Author: Kevin E Martin -Date: Sat Dec 3 05:49:42 2005 +0000 - - Update package version number for X11R7 RC3 release. - -commit f84239e6f526a4b52158c4670da8d1bd02d527f2 -Author: Kevin E Martin -Date: Sat Dec 3 04:41:48 2005 +0000 - - Add check and cflags for malloc(0) returning NULL. - -commit f125e444a022300ae4aa69db2d209cc3c2fbbe0b -Author: Alan Coopersmith -Date: Mon Nov 28 22:03:04 2005 +0000 - - Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 - update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) - -commit 110fc9c3da409c53f2d6f638d0a137c29559cd32 -Author: Kevin E Martin -Date: Sat Nov 19 07:15:40 2005 +0000 - - Update pkgconfig files to separate library build-time dependencies from - application build-time dependencies, and update package deps to work - with separate build roots. - -commit c6674701dade763eb2d3380755b4c23f47fa6cdb -Author: Kevin E Martin -Date: Wed Nov 9 21:19:12 2005 +0000 - - Update package version number for X11R7 RC2 release. - -commit 3e53ff688524152ea26436b9a5797d9a10647844 -Author: Kevin E Martin -Date: Tue Nov 1 15:11:50 2005 +0000 - - Update pkgcheck dependencies to work with separate build roots. - -commit c9df69c6197623623d5c7d444181cfaddb9b23bb -Author: Kevin E Martin -Date: Wed Oct 19 02:48:08 2005 +0000 - - Update package version number for RC1 release. - -commit b9bf386000f448f3ba559ea435840648a6b202f0 -Author: Alan Coopersmith -Date: Tue Oct 18 00:00:08 2005 +0000 - - Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to - work better with BSD make - -commit f6248446b56651ad08ef9ae036f3d266d5a1d108 -Author: Alan Coopersmith -Date: Mon Oct 17 21:13:15 2005 +0000 - - Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a - suffix rule (reported by Matthieu Herrb) - -commit 67f04ddabfdda0d8c69c8f251eab631e4b6585e4 -Author: Alan Coopersmith -Date: Thu Oct 13 04:25:46 2005 +0000 - - Add generated man pages to .cvsignores - -commit 1192ba3d6749837a501db95014c71f1d801b3bae -Author: Alan Coopersmith -Date: Thu Oct 13 01:44:46 2005 +0000 - - Use sed to fill in variables in man page Add shadow man pages for man pages - that document multiple functions. - -commit 8eb24cbd838af67ffe96b074dc66cfff3f12ada4 -Author: Kevin E Martin -Date: Fri Jul 29 21:22:50 2005 +0000 - - Various changes preparing packages for RC0: - - Verify and update package version numbers as needed - - Implement versioning scheme - - Change bug address to point to bugzilla bug entry form - - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to - reenable it) - - Fix makedepend to use pkgconfig and pass distcheck - - Update build script to build macros first - - Update modular Xorg version - -commit 4b937bf0b80d1e7520beda11e5958858c1d8be63 -Author: Daniel Stone -Date: Sat Jul 16 06:28:05 2005 +0000 - - Set soversion to 1.0.0 using -version-number. - -commit 4e618f40eedcb5f8b3e2e1e32cb055a65af52961 -Author: Daniel Stone -Date: Tue Jul 12 06:07:58 2005 +0000 - - Bump soversion to 1.0.0. - -commit c38c5edc353971b2ca6b3d2b55288b88cd46de5b -Author: Keith Packard -Date: Sat Jul 9 06:03:13 2005 +0000 - - Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory - -commit c1ed34d39740625d52eca7f2c5bf5c6797f28097 -Author: Søren Sandmann Pedersen -Date: Wed Jun 22 22:46:38 2005 +0000 - - Apply these patches from Theo van Klaveren: - lib-dmx.patch lib-FS.patch lib-X11.patch lib-XRes.patch - lib-XScrnSaver.patch lib-xtrans.patch - to make the libraries distcheck. - -commit 2dbb8e41c6accaf9d86f3fdadfed5aea330da1fd -Author: Søren Sandmann Pedersen -Date: Tue Jun 14 17:31:59 2005 +0000 - - XRes/src/Makefile.am: Add $(top_srcdir)/include to INCLUDES - -commit a30727351e6cdeb7ff2ffa0bddad8c3a1be9eda0 -Author: Søren Sandmann Pedersen -Date: Tue Jun 7 18:51:23 2005 +0000 - - - symlink.sh: Move XRes.h from proto/Resource to - lib/XRes/include/X11/extensions - - symlink.sh: Add XRes linking - - xc/lib/XRes/*.c: conditionally include config.h - - lib/XRes: add directories and build system. - -commit e47da1b068cd9b8a772a99e30b2c1d5271d4295e -Author: Egbert Eich -Date: Fri Apr 23 18:43:36 2004 +0000 - - Merging XORG-CURRENT into trunk - -commit 5597850916b8c24c6d430fcac50c88b2d97a6f01 -Author: Egbert Eich -Date: Sun Mar 14 08:32:00 2004 +0000 - - Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 - -commit 247bcd0cd4b6f288ebe950933aee57c8c429268d -Author: Egbert Eich -Date: Wed Mar 3 12:11:19 2004 +0000 - - Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 - -commit 16b6e9a93ba18983468ce7e4e58eea4a1e46adf1 -Author: Egbert Eich -Date: Thu Feb 26 13:35:30 2004 +0000 - - readding XFree86's cvs IDs - -commit 559e2ccbe7259e3cff4614c97a8b730bd9dafac2 -Author: Egbert Eich -Date: Thu Feb 26 09:22:39 2004 +0000 - - Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 - -commit c783cd6e35b7a7770b16518060b5cc970c9b3d0d -Author: Kaleb Keithley -Date: Fri Dec 19 20:54:31 2003 +0000 - - XFree86 4.3.99.902 (RC 2) - -commit 2dc3bb158d8859d529dce8c88066a7570351319d -Author: Kaleb Keithley -Date: Tue Nov 25 19:28:09 2003 +0000 - - XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks - -commit 345fbee57dc02964c90e8e232cb9274860276d27 -Author: Kaleb Keithley -Date: Tue Nov 25 19:28:09 2003 +0000 - - Initial revision - -commit 8379290050be8b8fcbdcc74e11cebbc637ff96ba -Author: Kaleb Keithley -Date: Fri Nov 14 16:48:47 2003 +0000 - - XFree86 4.3.0.1 - -commit 0ee742ac9989d710dafc982a212768d8311f80ff -Author: Kaleb Keithley -Date: Fri Nov 14 16:48:47 2003 +0000 - - Initial revision diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 8b82ade..0000000 --- a/INSTALL +++ /dev/null @@ -1,291 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 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. - - 6. Often, you can also type `make uninstall' to remove the installed - files again. - -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. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -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. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - -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 all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--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. - -`--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac index bc4e8a6..fc92739 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_PREREQ([2.60]) # digit in the version number to track changes which don't affect the # protocol, so XRes version l.n.m corresponds to protocol version l.n # -AC_INIT([libXres], [1.0.6], +AC_INIT([libXres], [1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -55,6 +55,12 @@ RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] # Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION]) +# Check for _XEatDataWords function that may be patched into older Xlib release +SAVE_LIBS="$LIBS" +LIBS="$XRES_LIBS" +AC_CHECK_FUNCS([_XEatDataWords]) +LIBS="$SAVE_LIBS" + AC_CONFIG_FILES([Makefile src/Makefile man/Makefile diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf new file mode 100644 index 0000000..bc478e6 --- /dev/null +++ b/packaging/baselibs.conf @@ -0,0 +1 @@ +libXres diff --git a/packaging/libXres.changes b/packaging/libXres.changes new file mode 100644 index 0000000..6962e46 --- /dev/null +++ b/packaging/libXres.changes @@ -0,0 +1,6 @@ +* Mon Mar 18 2013 Anas Nashif submit/trunk/20130221.150404@3b28597 +- Fixed package groups + +* Thu Feb 21 2013 Anas Nashif upstream/1.0.6@f334a82 +- Add baselibs.conf to support multilib + diff --git a/packaging/libXres.manifest b/packaging/libXres.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/libXres.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/libXres.spec b/packaging/libXres.spec index b73b880..d2873e1 100644 --- a/packaging/libXres.spec +++ b/packaging/libXres.spec @@ -1,6 +1,6 @@ Summary: X-Resource extension client library Name: libXres -Version: 1.0.6 +Version: 1.0.7 Release: 1 License: MIT Group: System Environment/Libraries @@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) /usr/share/license/%{name} -%doc AUTHORS COPYING ChangeLog +%doc AUTHORS COPYING %{_libdir}/libXRes.so.1 %{_libdir}/libXRes.so.1.0.0 @@ -64,4 +64,4 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libXRes.so %{_libdir}/pkgconfig/xres.pc #%dir %{_mandir}/man3x -#%{_mandir}/man3/*.3* +#%{_mandir}/man3/*.3* \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index fd508da..bf66d68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = \ $(XRES_CFLAGS) \ $(MALLOC_ZERO_CFLAGS) -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libXRes_la_LDFLAGS = -version-number 1:0:0 -no-undefined diff --git a/src/XRes.c b/src/XRes.c index 6091c96..ff21dd4 100644 --- a/src/XRes.c +++ b/src/XRes.c @@ -12,7 +12,18 @@ #include #include #include +#include +#ifndef HAVE__XEATDATAWORDS +static inline void _XEatDataWords(Display *dpy, unsigned long n) +{ +# ifndef LONG64 + if (n >= (ULONG_MAX >> 2)) + _XIOError(dpy); +# endif + _XEatData (dpy, n << 2); +} +#endif static XExtensionInfo _xres_ext_info_data; static XExtensionInfo *xres_ext_info = &_xres_ext_info_data; @@ -118,7 +129,12 @@ Status XResQueryClients ( } if(rep.num_clients) { - if((clnts = Xmalloc(sizeof(XResClient) * rep.num_clients))) { + if (rep.num_clients < (INT_MAX / sizeof(XResClient))) + clnts = Xmalloc(sizeof(XResClient) * rep.num_clients); + else + clnts = NULL; + + if (clnts != NULL) { xXResClient scratch; int i; @@ -131,7 +147,7 @@ Status XResQueryClients ( *num_clients = rep.num_clients; result = 1; } else { - _XEatData(dpy, rep.length << 2); + _XEatDataWords(dpy, rep.length); } } @@ -170,7 +186,12 @@ Status XResQueryClientResources ( } if(rep.num_types) { - if((typs = Xmalloc(sizeof(XResType) * rep.num_types))) { + if (rep.num_types < (INT_MAX / sizeof(XResType))) + typs = Xmalloc(sizeof(XResType) * rep.num_types); + else + typs = NULL; + + if (typs != NULL) { xXResType scratch; int i; @@ -183,7 +204,7 @@ Status XResQueryClientResources ( *num_types = rep.num_types; result = 1; } else { - _XEatData(dpy, rep.length << 2); + _XEatDataWords(dpy, rep.length); } }